commit d15750c0c7766ecab7022ea9b2f9e89a9132cbc2
author msarett <msarett@google.com> Fri Mar 18 15:48:49 2016 -0700
committer Commit bot <commit-bot@chromium.org> Fri Mar 18 15:48:49 2016 -0700
tree e697c7285402a9b32a1b5b390e20e73a253081c0
parent 07ec54d8e6c0e7e6ea11cde867c00bd29da79063

Remove uses of SkImageDecoder from samplecode

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1812323003

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

samplecode/SampleUnpremul.cpp

diff --git a/samplecode/SampleUnpremul.cpp b/samplecode/SampleUnpremul.cpp
index 4e3e1fa..fb9735c 100644
--- a/samplecode/SampleUnpremul.cpp
+++ b/samplecode/SampleUnpremul.cpp
@@ -8,14 +8,13 @@
 #include "gm.h"
 
 #include "sk_tool_utils.h"
+#include "DecodeFile.h"
 #include "Resources.h"
 #include "SampleCode.h"
 #include "SkBlurMask.h"
 #include "SkBlurDrawLooper.h"
 #include "SkCanvas.h"
 #include "SkColorPriv.h"
-#include "SkForceLinking.h"
-#include "SkImageDecoder.h"
 #include "SkOSFile.h"
 #include "SkStream.h"
 #include "SkString.h"
@@ -24,8 +23,6 @@
 #include "SkUtils.h"
 #include "SkView.h"
 
-__SK_FORCE_IMAGE_DECODER_LINKING;
-
 /**
  *  Interprets c as an unpremultiplied color, and returns the
  *  premultiplied equivalent.
@@ -167,17 +164,7 @@
             fDecodeSucceeded = false;
             return;
         }
-        SkFILEStream stream(fCurrFile.c_str());
-        SkAutoTDelete<SkImageDecoder> decoder(SkImageDecoder::Factory(&stream));
-        if (nullptr == decoder.get()) {
-            fDecodeSucceeded = false;
-            return;
-        }
-        if (!fPremul) {
-            decoder->setRequireUnpremultipliedColors(true);
-        }
-        fDecodeSucceeded = decoder->decode(&stream, &fBitmap, kN32_SkColorType,
-                SkImageDecoder::kDecodePixels_Mode) != SkImageDecoder::kFailure;
+        fDecodeSucceeded = decode_file(fCurrFile.c_str(), &fBitmap, kN32_SkColorType, !fPremul);
         this->inval(nullptr);
     }