remove SkCanvas::createCompatibleDevice, and add SkCanvas::newSurface

gm/extractbitmap.cpp

-
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+
 #include "gm.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkDevice.h"
 #include "SkString.h"
+#include "SkSurface.h"

[scroggo, 2014/02/05 16:41:12]

Did you mean to call newSurface in this file? It currently does not appear to
need this include.

 
 namespace skiagm {
 
 static void create_bitmap(SkBitmap* bitmap) {
     const int W = 100;
     const int H = 100;
     bitmap->allocN32Pixels(W, H);
 
     SkCanvas canvas(*bitmap);
     canvas.drawColor(SK_ColorRED);
@@ skipping 41 matching lines @@
             bitmap.extractSubset(&subset, SkIRect::MakeWH(x, bitmap.height()));
             SkAutoCanvasRestore autoRestore(canvas, true);
             canvas->translate(0, SkIntToScalar(bitmap.height() + 20));
             canvas->drawBitmap(subset, 0, 0);
             // Now draw a subet which has the same width and pixelref offset but
             // a different height
             bitmap.extractSubset(&subset, SkIRect::MakeWH(bitmap.height(), y));
             canvas->translate(0, SkIntToScalar(bitmap.height() + 20));
             canvas->drawBitmap(subset, 0, 0);
         }
-
-        // Now do the same but with a device bitmap as source image
-        SkAutoTUnref<SkBaseDevice> secondDevice(canvas->createCompatibleDevice(
-            SkBitmap::kARGB_8888_Config, bitmap.width(),
-            bitmap.height(), true));
-        SkCanvas secondCanvas(secondDevice.get());
-        secondCanvas.writePixels(bitmap, 0, 0);
-
-        SkBitmap deviceBitmap = secondDevice->accessBitmap(false);
-        SkBitmap deviceSubset;
-        deviceBitmap.extractSubset(&deviceSubset,
-             SkIRect::MakeXYWH(x, y, x, y));
-
-        canvas->translate(SkIntToScalar(120), SkIntToScalar(0));
-
-        canvas->drawBitmap(deviceBitmap, 0, 0);
-        canvas->drawBitmap(deviceSubset, 0, 0);
-
     }
 
 private:
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new ExtractBitmapGM; }
 static GMRegistry reg(MyFactory);
 
 }