Changing SkDeferredCanvas to use factories for creation

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.
  */
 
 #if SK_SUPPORT_GPU
 #include "GrRenderTarget.h"
@@ skipping 35 matching lines @@
 #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);
         }
-        SkDeferredCanvas drawingCanvas(surface);
+        SkAutoTUnref<SkDeferredCanvas> drawingCanvas(
+#if SK_DEFERRED_CANVAS_USES_FACTORIES
+            SkDeferredCanvas::Create(surface));
+#else
+            SkNEW_ARGS(SkDeferredCanvas, (surface)));
+#endif
         surface->unref();
 
         for (int iteration = 0; iteration < N; iteration++) {
-            drawingCanvas.clear(0);
-            SkAutoTUnref<SkImage> image(drawingCanvas.newImageSnapshot());
+            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);
+            drawingCanvas->drawRect(fullCanvasRect, paint);
             // Trigger copy on write, which should be faster in the discardable case.
-            drawingCanvas.flush();
+            drawingCanvas->flush();
         }
     }
 
 private:
     bool fDiscardableContents;
 
     typedef SkBenchmark INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkBenchmark* Fact0(void* p) { return new DeferredSurfaceCopyBench(p, false); }
 static SkBenchmark* Fact1(void* p) { return new DeferredSurfaceCopyBench(p, true); }
 
 static BenchRegistry gReg0(Fact0);
 static BenchRegistry gReg1(Fact1);