commit cb6222499625e78190a58e5a7df3ef8cc8e40f7a
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Aug 09 14:24:59 2013 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Aug 09 14:24:59 2013 +0000
tree ede5b52c057e20f45d057e191abae90fbaee8c2d
parent 1904df0413b9b665a5f8be7a4614abe5f2e30d21

Removing deprecated constructors and setDevice from SkDeferredCanvas

R=senorblanco@google.com, senorblanco@chromium.org
BUR=crbug.com/270143

Author: junov@chromium.org

Review URL: https://chromiumcodereview.appspot.com/22385011

git-svn-id: http://skia.googlecode.com/svn/trunk@10657 2bbb7eff-a529-9590-31e7-b0007b416f81

bench/DeferredCanvasBench.cpp

diff --git a/bench/DeferredCanvasBench.cpp b/bench/DeferredCanvasBench.cpp
index 5ef64db..9e7e7238 100644
--- a/bench/DeferredCanvasBench.cpp
+++ b/bench/DeferredCanvasBench.cpp
@@ -29,12 +29,7 @@
         SkDevice *device = canvas->getDevice()->createCompatibleDevice(
             SkBitmap::kARGB_8888_Config, CANVAS_WIDTH, CANVAS_HEIGHT, false);
 
-        SkAutoTUnref<SkDeferredCanvas> deferredCanvas(
-#if SK_DEFERRED_CANVAS_USES_FACTORIES
-            SkDeferredCanvas::Create(device));
-#else
-            SkNEW_ARGS(SkDeferredCanvas, (device)));
-#endif
+        SkAutoTUnref<SkDeferredCanvas> deferredCanvas(SkDeferredCanvas::Create(device));
         device->unref();
 
         initDeferredCanvas(deferredCanvas);

bench/DeferredSurfaceCopyBench.cpp

diff --git a/bench/DeferredSurfaceCopyBench.cpp b/bench/DeferredSurfaceCopyBench.cpp
index 483507b..cbf96d0 100644
--- a/bench/DeferredSurfaceCopyBench.cpp
+++ b/bench/DeferredSurfaceCopyBench.cpp
@@ -53,12 +53,7 @@
         {
             surface = SkSurface::NewRaster(info);
         }
-        SkAutoTUnref<SkDeferredCanvas> drawingCanvas(
-#if SK_DEFERRED_CANVAS_USES_FACTORIES
-            SkDeferredCanvas::Create(surface));
-#else
-            SkNEW_ARGS(SkDeferredCanvas, (surface)));
-#endif
+        SkAutoTUnref<SkDeferredCanvas> drawingCanvas(SkDeferredCanvas::Create(surface));
         surface->unref();
 
         for (int iteration = 0; iteration < N; iteration++) {

bench/benchmain.cpp

diff --git a/bench/benchmain.cpp b/bench/benchmain.cpp
index 2248753..9cb7468 100644
--- a/bench/benchmain.cpp
+++ b/bench/benchmain.cpp
@@ -792,12 +792,7 @@
                     switch(benchMode) {
                         case kDeferredSilent_benchModes:
                         case kDeferred_benchModes:
-                            canvas =
-#if SK_DEFERRED_CANVAS_USES_FACTORIES
-                                SkDeferredCanvas::Create(device);
-#else
-                                SkNEW_ARGS(SkDeferredCanvas, (device));
-#endif
+                            canvas = SkDeferredCanvas::Create(device);
                             break;
                         case kRecord_benchModes:
                             canvas = pictureRecordTo.beginRecording(dim.fX, dim.fY,