Merge SkCodec with SkScanlineDecoder

include/codec/SkScaledCodec.h

Index: include/codec/SkScaledCodec.h
diff --git a/include/codec/SkScaledCodec.h b/include/codec/SkScaledCodec.h
index 1bcdf085b213f7eaab1cb9d9eca51a491138c58f..20428d8d73f40b0a391dfa061131fe1358fbb27c 100644
--- a/include/codec/SkScaledCodec.h
+++ b/include/codec/SkScaledCodec.h
@@ -8,9 +8,7 @@
 #define SkScaledCodec_DEFINED
 
 #include "SkCodec.h"
-#include "SkScanlineDecoder.h"
 
-class SkScanlineDecoder;
 class SkStream;
 
 /**
@@ -52,18 +50,18 @@ protected:
     Result onGetPixels(const SkImageInfo&, void*, size_t, const Options&, SkPMColor*, int*)
             override;
     SkEncodedFormat onGetEncodedFormat() const override {
-        return fScanlineDecoder->getEncodedFormat();
+        return fCodec->getEncodedFormat();
     }
 
     bool onReallyHasAlpha() const override {
-        return fScanlineDecoder->reallyHasAlpha();
+        return fCodec->reallyHasAlpha();
     }
 
 private:
 
-    SkAutoTDelete<SkScanlineDecoder> fScanlineDecoder;
+    SkAutoTDelete<SkCodec> fCodec;
 
-    explicit SkScaledCodec(SkScanlineDecoder*);
+    explicit SkScaledCodec(SkCodec*);
 
     typedef SkCodec INHERITED;
 };