diff options
| author |  Matt Sarett <msarett@google.com> | 2017-05-19 12:57:03 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-19 17:20:23 +0000 |
| commit | 09e9f68625db41a1bdbac6738e2d4b57268ac5ca (patch) | |
| tree | 779c0c1d17b7fea89f382a7300a6480b5c6001c9 | |
| parent | 618ed8ac39cca33ba170373b4d9181150a9022ad (diff) | |
Temporarily use default webp encode method for bzl
I suspect that this will fix the failing golden image tests.
Bug: skia:
Change-Id: I9f88206ae782e6a04817e72cdfcb3e0c4bdaa293
Reviewed-on: https://skia-review.googlesource.com/17393
Commit-Queue: Matt Sarett <msarett@google.com>
Reviewed-by: Leon Scroggins <scroggo@google.com>
| -rw-r--r-- | public.bzl | 2 | ||||
| -rw-r--r-- | src/images/SkWebpEncoder.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/public.bzl b/public.bzl index 1813af0cb7..ba3b3b0953 100644 --- a/public.bzl +++ b/public.bzl @@ -659,6 +659,8 @@ DEFINES_ALL = [ # Turn on a few Google3-specific build fixes. "GOOGLE3", # Staging flags for API changes + # Should remove after we update golden images + "SK_WEBP_ENCODER_USE_DEFAULT_METHOD", # Temporarily Disable analytic AA for Google3 "SK_NO_ANALYTIC_AA", ] diff --git a/src/images/SkWebpEncoder.cpp b/src/images/SkWebpEncoder.cpp index b6c6212314..276837cb12 100644 --- a/src/images/SkWebpEncoder.cpp +++ b/src/images/SkWebpEncoder.cpp @@ -171,7 +171,9 @@ bool SkWebpEncoder::Encode(SkWStream* stream, const SkPixmap& pixmap, const Opti // could potentially expose this to the client. if (Compression::kLossy == opts.fCompression) { webp_config.lossless = 0; +#ifndef SK_WEBP_ENCODER_USE_DEFAULT_METHOD webp_config.method = 3; +#endif } else { webp_config.lossless = 1; webp_config.method = 0; |