diff options
| author |  mtklein <mtklein@google.com> | 2016-08-03 19:19:48 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-08-03 19:19:48 -0700 |
| commit | b97963401220da82455e0dfe1f7206e7e8b249e1 (patch) | |
| tree | f3415f1aa9e9b89ca3992506de4435b287cf05bb /src/images | |
| parent | 52d1be5ca7b1ba8cc450be7dd6377ea5bb73386a (diff) | |
Revert of SkRTConf: reduce functionality to what we use, increase simplicity (patchset #8 id:150001 of https://codereview.chromium.org/2212473002/ )
Reason for revert:
missed GrVkPipelineStateCache
Original issue's description:
> SkRTConf: reduce functionality to what we use, increase simplicity
>
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2212473002
> DOCS_PREVIEW= https://skia.org/?cl=2212473002
> CQ_INCLUDE_TRYBOTS=master.client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD-Trybot
>
> [mtklein]
> TBR=reed@google.com
> Only removing unused public API.
>
> Committed: https://skia.googlesource.com/skia/+/ef59974708dade6fa72fb0218d4f8a9590175c47
TBR=halcanary@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review-Url: https://codereview.chromium.org/2215433003
Diffstat (limited to 'src/images')
| -rw-r--r-- | src/images/SkJPEGImageEncoder.cpp | 1 | ||||
| -rw-r--r-- | src/images/SkPNGImageEncoder.cpp | 9 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/images/SkJPEGImageEncoder.cpp b/src/images/SkJPEGImageEncoder.cpp index 66b2440c20..1051aec205 100644 --- a/src/images/SkJPEGImageEncoder.cpp +++ b/src/images/SkJPEGImageEncoder.cpp @@ -13,6 +13,7 @@ #include "SkTemplates.h" #include "SkTime.h" #include "SkUtils.h" +#include "SkRTConf.h" #include "SkRect.h" #include "SkCanvas.h" diff --git a/src/images/SkPNGImageEncoder.cpp b/src/images/SkPNGImageEncoder.cpp index 1932e66dc6..c3df5d10a8 100644 --- a/src/images/SkPNGImageEncoder.cpp +++ b/src/images/SkPNGImageEncoder.cpp @@ -10,6 +10,7 @@ #include "SkColorPriv.h" #include "SkDither.h" #include "SkMath.h" +#include "SkRTConf.h" #include "SkStream.h" #include "SkTemplates.h" #include "SkUtils.h" @@ -35,9 +36,11 @@ #endif #define DEFAULT_FOR_SUPPRESS_PNG_IMAGE_DECODER_WARNINGS true -// Suppress most PNG warnings when calling image decode functions. -static const bool c_suppressPNGImageDecoderWarnings{ - DEFAULT_FOR_SUPPRESS_PNG_IMAGE_DECODER_WARNINGS}; +SK_CONF_DECLARE(bool, c_suppressPNGImageDecoderWarnings, + "images.png.suppressDecoderWarnings", + DEFAULT_FOR_SUPPRESS_PNG_IMAGE_DECODER_WARNINGS, + "Suppress most PNG warnings when calling image decode " + "functions."); /////////////////////////////////////////////////////////////////////////////// |