SkCanvas::setDevice() must die, and so we begin by removing our own

references to setBitmapDevice() (gotta walk before we can run)



git-svn-id: http://skia.googlecode.com/svn/trunk@5680 2bbb7eff-a529-9590-31e7-b0007b416f81

2 files changed, 17 insertions, 15 deletions

diff --git a/gm/bitmaprect.cpp b/gm/bitmaprect.cpp
index 0e6c074e83..42f043e058 100644
--- a/gm/bitmaprect.cpp
+++ b/gm/bitmaprect.cpp
@@ -14,13 +14,10 @@
 #include "SkShader.h"
 
 static void make_bitmap(SkBitmap* bitmap) {
-    SkCanvas canvas;
+    bitmap->setConfig(SkBitmap::kARGB_8888_Config, 64, 64);
+    bitmap->allocPixels();
 
-    {
-        bitmap->setConfig(SkBitmap::kARGB_8888_Config, 64, 64);
-        bitmap->allocPixels();
-        canvas.setBitmapDevice(*bitmap);
-    }
+    SkCanvas canvas(*bitmap);
 
     canvas.drawColor(SK_ColorRED);
     SkPaint paint;
diff --git a/gm/xfermodes.cpp b/gm/xfermodes.cpp
index 25100d29dc..22b6edd918 100644
--- a/gm/xfermodes.cpp
+++ b/gm/xfermodes.cpp
@@ -17,25 +17,30 @@ static void make_bitmaps(int w, int h, SkBitmap* src, SkBitmap* dst) {
     src->allocPixels();
     src->eraseColor(0);
 
-    SkCanvas c(*src);
     SkPaint p;
+    p.setAntiAlias(true);
+
     SkRect r;
     SkScalar ww = SkIntToScalar(w);
     SkScalar hh = SkIntToScalar(h);
 
-    p.setAntiAlias(true);
-    p.setColor(0xFFFFCC44);
-    r.set(0, 0, ww*3/4, hh*3/4);
-    c.drawOval(r, p);
+    {
+        SkCanvas c(*src);
+        p.setColor(0xFFFFCC44);
+        r.set(0, 0, ww*3/4, hh*3/4);
+        c.drawOval(r, p);
+    }
 
     dst->setConfig(SkBitmap::kARGB_8888_Config, w, h);
     dst->allocPixels();
     dst->eraseColor(0);
-    c.setBitmapDevice(*dst);
 
-    p.setColor(0xFF66AAFF);
-    r.set(ww/3, hh/3, ww*19/20, hh*19/20);
-    c.drawRect(r, p);
+    {
+        SkCanvas c(*dst);
+        p.setColor(0xFF66AAFF);
+        r.set(ww/3, hh/3, ww*19/20, hh*19/20);
+        c.drawRect(r, p);
+    }
 }
 
 class XfermodesGM : public GM {