From f0419e96b4b52b85fafd0d589c56944841dcda06 Mon Sep 17 00:00:00 2001 From: scroggo Date: Wed, 11 Jun 2014 10:51:42 -0700 Subject: [PATCH] Hide chooseFromOneChoice along with Chooser. Fixes chrome canary. R=reed@android.com TBR=reed NOTRY=true Author: scroggo@google.com Review URL: https://codereview.chromium.org/329113003 --- src/ports/SkImageDecoder_empty.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/ports/SkImageDecoder_empty.cpp b/src/ports/SkImageDecoder_empty.cpp index 1759e36..74f9cc4 100644 --- a/src/ports/SkImageDecoder_empty.cpp +++ b/src/ports/SkImageDecoder_empty.cpp @@ -96,9 +96,11 @@ bool SkImageDecoder::cropBitmap(SkBitmap*, SkBitmap*, int, int, int, int, int, return false; } +#ifdef SK_SUPPORT_LEGACY_IMAGEDECODER_CHOOSER bool SkImageDecoder::chooseFromOneChoice(SkColorType, int, int) const { return false; } +#endif bool SkImageDecoder::allocPixelRef(SkBitmap*, SkColorTable*) const { return false; -- 2.7.4