stop calling SkCanvas::getDevice

bench/DeferredSurfaceCopyBench.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 "Benchmark.h"
 #include "SkDeferredCanvas.h"
@@ skipping 16 matching lines @@
 
 protected:
     virtual const char* onGetName() SK_OVERRIDE {
         return fDiscardableContents ? "DeferredSurfaceCopy_discardable" :
             "DeferredSurfaceCopy_nonDiscardable";
     }
 
     virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
         // The canvas is not actually used for this test except to provide
         // configuration information: gpu, multisampling, size, etc?
-        SkImageInfo info;
-        info.fWidth = kSurfaceWidth;
-        info.fHeight = kSurfaceHeight;
-        info.fColorType = kN32_SkColorType;
-        info.fAlphaType = kPremul_SkAlphaType;
+        SkImageInfo info = SkImageInfo::MakeN32Premul(kSurfaceWidth, kSurfaceHeight);
         const SkRect fullCanvasRect = SkRect::MakeWH(
             SkIntToScalar(kSurfaceWidth), SkIntToScalar(kSurfaceHeight));
-        SkSurface* surface;
-#if SK_SUPPORT_GPU
-        GrRenderTarget* rt = reinterpret_cast<GrRenderTarget*>(
-            canvas->getDevice()->accessRenderTarget());
-        if (NULL != rt) {
-            surface = SkSurface::NewRenderTarget(rt->getContext(), info, rt->numSamples());
-        } else
-#endif
-        {
-            surface = SkSurface::NewRaster(info);
-        }
+        SkAutoTUnref<SkSurface> surface(canvas->newSurface(info));
         SkAutoTUnref<SkDeferredCanvas> drawingCanvas(SkDeferredCanvas::Create(surface));
-        surface->unref();
 
         for (int iteration = 0; iteration < loops; iteration++) {
             drawingCanvas->clear(0);
             SkAutoTUnref<SkImage> image(drawingCanvas->newImageSnapshot());
             SkPaint paint;
             if (!fDiscardableContents) {
                 // If paint is not opaque, prior canvas contents are
                 // not discardable because they are needed for compositing.
                 paint.setAlpha(127);
             }
             drawingCanvas->drawRect(fullCanvasRect, paint);
             // Trigger copy on write, which should be faster in the discardable case.
             drawingCanvas->flush();
         }
     }
 
 private:
     bool fDiscardableContents;
 
     typedef Benchmark INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_BENCH( return new DeferredSurfaceCopyBench(false); )
 DEF_BENCH( return new DeferredSurfaceCopyBench(true); )