Implementation of SkBitmapRegionDecoder using SkAndroidCodec

tools/SkBitmapRegionCodec.h

Index: tools/SkBitmapRegionCodec.h
diff --git a/tools/SkBitmapRegionCanvas.h b/tools/SkBitmapRegionCodec.h
similarity index 62%
copy from tools/SkBitmapRegionCanvas.h
copy to tools/SkBitmapRegionCodec.h
index f82e9fa77a941b01dee6d746d2a2fb02006ea40e..bec512b426ce9ca1fd0f7f43992011deefcfa20d 100644
--- a/tools/SkBitmapRegionCanvas.h
+++ b/tools/SkBitmapRegionCodec.h
@@ -10,19 +10,15 @@
 #include "SkCodec.h"
 
 /*
- * This class implements SkBitmapRegionDecoder using an SkCodec and
- * an SkCanvas.  It uses the scanline decoder to subset the height.  It then
- * will subset the width and scale by drawing to an SkCanvas.
+ * This class implements SkBitmapRegionDecoder using an SkScaledCodec.
  */
-// FIXME (msarett): This implementation does not support WEBP, because WEBP
-// does not have a scanline decoder.
-class SkBitmapRegionCanvas : public SkBitmapRegionDecoderInterface {
+class SkBitmapRegionCodec : public SkBitmapRegionDecoderInterface {
 public:
 
     /*
-     * Takes ownership of pointer to decoder
+     * Takes ownership of pointer to codec
      */
-    SkBitmapRegionCanvas(SkCodec* decoder);
+    SkBitmapRegionCodec(SkCodec* codec);
 
     /*
      * Three differences from the Android version:
@@ -38,7 +34,7 @@ public:
 
 private:
 
-    SkAutoTDelete<SkCodec> fDecoder;
+    SkAutoTDelete<SkCodec> fCodec;
 
     typedef SkBitmapRegionDecoderInterface INHERITED;