remove unused SkAutoROCanvasPixels

gm/xfermodes3.cpp

-
 /*
  * Copyright 2013 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 "SkGradientShader.h"
+#include "SkSurface.h"
 #include "SkXfermode.h"
 #include "SkColorPriv.h"
 
 #if SK_SUPPORT_GPU
 #include "GrContext.h"
 #include "SkGpuDevice.h"
 #endif
 
 namespace skiagm {
 
@@ skipping 31 matching lines @@
             SK_ColorTRANSPARENT,
             SK_ColorBLUE,
             0x80808000
         };
 
         static const SkColor kBmpAlphas[] = {
             0xff,
             0x80,
         };
 
-        SkAutoTUnref<SkCanvas> tempCanvas(this->possiblyCreateTempCanvas(canvas, kSize, kSize));
+        SkAutoTUnref<SkSurface> tempSurface(this->possiblyCreateTempSurface(canvas, kSize, kSize));
 
         int test = 0;
         int x = 0, y = 0;
         static const struct { SkPaint::Style fStyle; SkScalar fWidth; } kStrokes[] = {
             {SkPaint::kFill_Style, 0},
             {SkPaint::kStroke_Style, SkIntToScalar(kSize) / 2},
         };
         for (size_t s = 0; s < SK_ARRAY_COUNT(kStrokes); ++s) {
             for (size_t m = 0; m <= SkXfermode::kLastMode; ++m) {
                 SkXfermode::Mode mode = static_cast<SkXfermode::Mode>(m);
                 canvas->drawText(SkXfermode::ModeName(mode),
                                  strlen(SkXfermode::ModeName(mode)),
                                  SkIntToScalar(x),
                                  SkIntToScalar(y + kSize + 3) + labelP.getTextSize(),
                                  labelP);
                 for (size_t c = 0; c < SK_ARRAY_COUNT(kSolidColors); ++c) {
                     SkPaint modePaint;
                     modePaint.setXfermodeMode(mode);
                     modePaint.setColor(kSolidColors[c]);
                     modePaint.setStyle(kStrokes[s].fStyle);
                     modePaint.setStrokeWidth(kStrokes[s].fWidth);
 
-                    this->drawMode(canvas, x, y, kSize, kSize, modePaint, tempCanvas.get());
+                    this->drawMode(canvas, x, y, kSize, kSize, modePaint, tempSurface);
 
                     ++test;
                     x += kSize + 10;
                     if (!(test % kTestsPerRow)) {
                         x = 0;
                         y += kSize + 30;
                     }
                 }
                 for (size_t a = 0; a < SK_ARRAY_COUNT(kBmpAlphas); ++a) {
                     SkPaint modePaint;
                     modePaint.setXfermodeMode(mode);
                     modePaint.setAlpha(kBmpAlphas[a]);
                     modePaint.setShader(fBmpShader);
                     modePaint.setStyle(kStrokes[s].fStyle);
                     modePaint.setStrokeWidth(kStrokes[s].fWidth);
 
-                    this->drawMode(canvas, x, y, kSize, kSize, modePaint, tempCanvas.get());
+                    this->drawMode(canvas, x, y, kSize, kSize, modePaint, tempSurface);
 
                     ++test;
                     x += kSize + 10;
                     if (!(test % kTestsPerRow)) {
                         x = 0;
                         y += kSize + 30;
                     }
                 }
             }
         }
     }
 
 private:
     /**
      * GrContext has optimizations around full rendertarget draws that can be replaced with clears.
      * We are trying to test those. We could use saveLayer() to create small SkGpuDevices but
      * saveLayer() uses the texture cache. This means that the actual render target may be larger
      * than the layer. Because the clip will contain the layer's bounds, no draws will be full-RT.
      * So when running on a GPU canvas we explicitly create a temporary canvas using a texture with
      * dimensions exactly matching the layer size.
      */
-    SkCanvas* possiblyCreateTempCanvas(SkCanvas* baseCanvas, int w, int h) {
-        SkCanvas* tempCanvas = nullptr;
+    SkSurface* possiblyCreateTempSurface(SkCanvas* baseCanvas, int w, int h) {
 #if SK_SUPPORT_GPU
         GrContext* context = baseCanvas->getGrContext();
         SkImageInfo baseInfo = baseCanvas->imageInfo();
         SkImageInfo info = SkImageInfo::Make(w, h, baseInfo.colorType(), baseInfo.alphaType(),
                                              baseInfo.profileType());
-        SkAutoTUnref<SkSurface> surface(SkSurface::NewRenderTarget(context, SkSurface::kNo_Budgeted,
-                                        info, 0, nullptr));
-        if (surface) {
-            tempCanvas = SkRef(surface->getCanvas());
-        }
+        return SkSurface::NewRenderTarget(context, SkSurface::kNo_Budgeted, info, 0, nullptr);
+#else
+        return nullptr;
 #endif
-        return tempCanvas;
     }
 
     void drawMode(SkCanvas* canvas,
                   int x, int y, int w, int h,
-                  const SkPaint& modePaint, SkCanvas* layerCanvas) {
+                  const SkPaint& modePaint, SkSurface* surface) {
         canvas->save();
-
         canvas->translate(SkIntToScalar(x), SkIntToScalar(y));
 
         SkRect r = SkRect::MakeWH(SkIntToScalar(w), SkIntToScalar(h));
 
         SkCanvas* modeCanvas;
-        if (nullptr == layerCanvas) {
+        if (nullptr == surface) {
             canvas->saveLayer(&r, nullptr);
             modeCanvas = canvas;
         } else {
-            modeCanvas = layerCanvas;
+            modeCanvas = surface->getCanvas();
         }
 
         SkPaint bgPaint;
         bgPaint.setAntiAlias(false);
         bgPaint.setShader(fBGShader);
         modeCanvas->drawRect(r, bgPaint);
         modeCanvas->drawRect(r, modePaint);
         modeCanvas = nullptr;
 
-        if (nullptr == layerCanvas) {
+        if (nullptr == surface) {
             canvas->restore();
         } else {
-            SkAutoROCanvasPixels ropixels(layerCanvas);
-            SkBitmap bitmap;
-            if (ropixels.asROBitmap(&bitmap)) {
-                canvas->drawBitmap(bitmap, 0, 0);
-            }
+            surface->draw(canvas, 0, 0, nullptr);
         }
 
         r.inset(-SK_ScalarHalf, -SK_ScalarHalf);
         SkPaint borderPaint;
         borderPaint.setStyle(SkPaint::kStroke_Style);
         canvas->drawRect(r, borderPaint);
 
         canvas->restore();
     }
 
@@ skipping 51 matching lines @@
     SkAutoTUnref<SkShader> fBmpShader;
 
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new Xfermodes3GM;)
 
 }