Merge SkCodec with SkScanlineDecoder

src/codec/SkCodec_wbmp.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkCodec_wbmp_DEFINED
 #define SkCodec_wbmp_DEFINED
 
 #include "SkCodec.h"
-#include "SkScanlineDecoder.h"
 #include "SkSwizzler.h"
 
 class SkWbmpCodec final : public SkCodec {
 public:
     static bool IsWbmp(SkStream*);
 
     /*
      * Assumes IsWbmp was called and returned true
      * Creates a wbmp codec
      * Takes ownership of the stream
      */
     static SkCodec* NewFromStream(SkStream*);
 
-    /*
-     * Assumes IsWbmp was called and returned true
-     * Creates a wbmp scanline decoder
-     * Takes ownership of the stream
-     */
-    static SkScanlineDecoder* NewSDFromStream(SkStream*);
 protected:
     SkEncodedFormat onGetEncodedFormat() const override;
     Result onGetPixels(const SkImageInfo&, void*, size_t,
                        const Options&, SkPMColor[], int*) override;
     bool onRewind() override;
 private:
     /*
      * Returns a swizzler on success, nullptr on failure
      */
     SkSwizzler* initializeSwizzler(const SkImageInfo& info, const SkPMColor* ctable,
                                    const Options& opts);
 
     /*
      * Read a src row from the encoded stream
      */
     Result readRow(uint8_t* row);
 
     SkWbmpCodec(const SkImageInfo&, SkStream*);
 
     const size_t fSrcRowBytes;
 
-    friend class SkWbmpScanlineDecoder;
+    // Used for scanline decodes:
+    SkAutoTUnref<SkColorTable>   fColorTable;
+    SkAutoTDelete<SkSwizzler>    fSwizzler;
+    SkAutoTMalloc<uint8_t>       fSrcBuffer;
+
+    Result onGetScanlines(void* dst, int count, size_t dstRowBytes) override;
+    Result onStart(const SkImageInfo& dstInfo, const Options& options,
+            SkPMColor inputColorTable[], int* inputColorCount) override;
+
     typedef SkCodec INHERITED;
 };
 
 #endif  // SkCodec_wbmp_DEFINED