stop calling SkCanvas::getDevice

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"
@@ skipping 105 matching lines @@
      * 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 = NULL;
 #if SK_SUPPORT_GPU
-        GrRenderTarget* rt = baseCanvas->getDevice()->accessRenderTarget();
-        if (NULL != rt) {
-            GrContext* context = rt->getContext();
+        GrContext* context = baseCanvas->getGrContext();
+        if (NULL != context) {
             GrTextureDesc desc;
             desc.fWidth = w;
             desc.fHeight = h;
-            desc.fConfig = rt->config();
+            desc.fConfig = SkImageInfo2GrPixelConfig(baseCanvas->imageInfo());
             desc.fFlags = kRenderTarget_GrTextureFlagBit;
             SkAutoTUnref<GrSurface> surface(context->createUncachedTexture(desc, NULL, 0));
             SkAutoTUnref<SkBaseDevice> device(SkGpuDevice::Create(surface.get()));
             if (NULL != device.get()) {
                 tempCanvas = SkNEW_ARGS(SkCanvas, (device.get()));
             }
         }
 #endif
         return tempCanvas;
     }
@@ skipping 94 matching lines @@
     SkAutoTUnref<SkShader> fBmpShader;
 
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new Xfermodes3GM;)
 
 }