commit 5926b86b90c68bffefbdc8639e41b5bc9102cec6
author reed <reed@google.com> Wed Jun 11 10:33:13 2014 -0700
committer Commit bot <commit-bot@chromium.org> Wed Jun 11 10:33:13 2014 -0700
tree a20f97bc8a3c5f8224071b23c0b1112f669f05bf
parent d58a0ba9cff9fcefe5047e88ccb4a6e76c591c40

hide SkImageDecoder::Chooser

BUG=skia:
R=scroggo@google.com

Author: reed@google.com

Review URL: https://codereview.chromium.org/331433003

src/images/SkImageDecoder_libwebp.cpp

diff --git a/src/images/SkImageDecoder_libwebp.cpp b/src/images/SkImageDecoder_libwebp.cpp
index 8baa10c..7a3c658 100644
--- a/src/images/SkImageDecoder_libwebp.cpp
+++ b/src/images/SkImageDecoder_libwebp.cpp
@@ -292,9 +292,11 @@
         }
     }
 
+#ifdef SK_SUPPORT_LEGACY_IMAGEDECODER_CHOOSER
     if (!this->chooseFromOneChoice(colorType, width, height)) {
         return false;
     }
+#endif
 
     SkAlphaType alphaType = kOpaque_SkAlphaType;
     if (SkToBool(fHasAlpha)) {
@@ -379,12 +381,14 @@
         if (!allocResult) {
             return return_false(*decodedBitmap, "allocPixelRef");
         }
+#ifdef SK_SUPPORT_LEGACY_IMAGEDECODER_CHOOSER
     } else {
         // This is also called in setDecodeConfig in above block.
         // i.e., when bitmap->isNull() is true.
         if (!chooseFromOneChoice(bitmap->colorType(), width, height)) {
             return false;
         }
+#endif
     }
 
     SkAutoLockPixels alp(*bitmap);