SkImageSource

gm/imagesource.cpp

Index: gm/imagesource.cpp
diff --git a/gm/bitmapsource.cpp b/gm/imagesource.cpp
similarity index 69%
copy from gm/bitmapsource.cpp
copy to gm/imagesource.cpp
index 155785b200b482bae46889beb230b25395a7628e..514646460fd5c9f68af7298a9d7ce71f8086dedf 100644
--- a/gm/bitmapsource.cpp
+++ b/gm/imagesource.cpp
@@ -7,24 +7,25 @@
 
 #include "gm.h"
 
-#include "SkBitmapSource.h"
+#include "SkImage.h"
+#include "SkImageSource.h"
 
-// This GM exercises the SkBitmapSource ImageFilter class.
+// This GM exercises the SkImageSource ImageFilter class.
 
-class BitmapSourceGM : public skiagm::GM {
+class ImageSourceGM : public skiagm::GM {
 public:
-    BitmapSourceGM() {
-    }
+    ImageSourceGM() { }
 
 protected:
     SkString onShortName() override {
-        return SkString("bitmapsource");
+        return SkString("imagesource");
     }
 
     SkISize onISize() override { return SkISize::Make(500, 150); }
 
     void onOnceBeforeDraw() override {
-        fBitmap = sk_tool_utils::create_string_bitmap(100, 100, 0xFFFFFFFF, 20, 70, 96, "e");
+        SkBitmap bm = sk_tool_utils::create_string_bitmap(100, 100, 0xFFFFFFFF, 20, 70, 96, "e");
+        fImage.reset(SkImage::NewFromBitmap(bm));
     }
 
     static void FillRectFiltered(SkCanvas* canvas, const SkRect& clipRect, SkImageFilter* filter) {
@@ -42,12 +43,14 @@ protected:
             SkRect srcRect = SkRect::MakeXYWH(20, 20, 30, 30);
             SkRect dstRect = SkRect::MakeXYWH(0, 10, 60, 60);
             SkRect clipRect = SkRect::MakeXYWH(0, 0, 100, 100);
-            SkRect bounds;
-            fBitmap.getBounds(&bounds);
-            SkAutoTUnref<SkImageFilter> bitmapSource(SkBitmapSource::Create(fBitmap));
-            SkAutoTUnref<SkImageFilter> bitmapSourceSrcRect(SkBitmapSource::Create(fBitmap, srcRect, srcRect));
-            SkAutoTUnref<SkImageFilter> bitmapSourceSrcRectDstRect(SkBitmapSource::Create(fBitmap, srcRect, dstRect));
-            SkAutoTUnref<SkImageFilter> bitmapSourceDstRectOnly(SkBitmapSource::Create(fBitmap, bounds, dstRect));
+            SkRect bounds = SkRect::MakeIWH(fImage->width(), fImage->height());
+            SkAutoTUnref<SkImageFilter> bitmapSource(SkImageSource::Create(fImage));
+            SkAutoTUnref<SkImageFilter> bitmapSourceSrcRect(
+                SkImageSource::Create(fImage, srcRect, srcRect));
+            SkAutoTUnref<SkImageFilter> bitmapSourceSrcRectDstRect(
+                SkImageSource::Create(fImage, srcRect, dstRect));
+            SkAutoTUnref<SkImageFilter> bitmapSourceDstRectOnly(
+                SkImageSource::Create(fImage, bounds, dstRect));
 
             // Draw an unscaled bitmap.
             FillRectFiltered(canvas, clipRect, bitmapSource);
@@ -68,10 +71,10 @@ protected:
     }
 
 private:
-    SkBitmap fBitmap;
+    SkAutoTUnref<SkImage> fImage;
     typedef GM INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
-DEF_GM( return new BitmapSourceGM; )
+DEF_GM( return new ImageSourceGM; )