Merge SkCodec with SkScanlineDecoder

tools/SkBitmapRegionCanvas.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmapRegionCanvas.h"
 #include "SkCanvas.h"
-#include "SkScanlineDecoder.h"
 
-SkBitmapRegionCanvas::SkBitmapRegionCanvas(SkScanlineDecoder* decoder)
+SkBitmapRegionCanvas::SkBitmapRegionCanvas(SkCodec* decoder)
     : INHERITED(decoder->getInfo().width(), decoder->getInfo().height())
     , fDecoder(decoder)
 {}
 
 /*
  * Chooses the correct image subset offsets and dimensions for the partial decode.
  */
 static inline void set_subset_region(int inputOffset, int inputDimension,
         int imageOriginalDimension, int* imageSubsetOffset, int* outOffset,
         int* imageSubsetDimension) {
@@ skipping 84 matching lines @@
 
     // Create the image info for the decode
     SkAlphaType dstAlphaType = fDecoder->getInfo().alphaType();
     if (kUnpremul_SkAlphaType == dstAlphaType) {
         dstAlphaType = kPremul_SkAlphaType;
     }
     SkImageInfo decodeInfo = SkImageInfo::Make(this->width(), this->height(),
             dstColorType, dstAlphaType);
     
     // Start the scanline decoder
-    SkCodec::Result r = fDecoder->start(decodeInfo);
+    SkCodec::Result r = fDecoder->startScanlineDecode(decodeInfo);
     if (SkCodec::kSuccess != r) {
         SkDebugf("Error: Could not start scanline decoder.\n");
         return nullptr;
     }
 
     // Allocate a bitmap for the unscaled decode
     SkBitmap tmp;
     SkImageInfo tmpInfo = decodeInfo.makeWH(this->width(), imageSubsetHeight);
     if (!tmp.tryAllocPixels(tmpInfo)) {
         SkDebugf("Error: Could not allocate pixels.\n");
@@ skipping 52 matching lines @@
             (SkScalar) get_scaled_dimension(imageSubsetWidth, sampleSize),
             (SkScalar) get_scaled_dimension(imageSubsetHeight, sampleSize));
     SkPaint paint;
     // Overwrite the dst with the src pixels
     paint.setXfermodeMode(SkXfermode::kSrc_Mode);
     // TODO (msarett): Test multiple filter qualities.  kNone is the default.
     canvas.drawBitmapRect(tmp, src, dst, &paint);
 
     return bitmap.detach();
 }