Changing SkDeferredCanvas to use factories for creation

tests/CanvasTest.cpp

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 /*  Description:
  *      This test defines a series of elementatry test steps that perform
@@ skipping 759 matching lines @@
 class SkDeferredCanvasTester {
 public:
     static void TestDeferredCanvasStateConsistency(
         skiatest::Reporter* reporter,
         CanvasTestStep* testStep,
         const SkCanvas& referenceCanvas, bool silent) {
 
         SkBitmap deferredStore;
         createBitmap(&deferredStore, SkBitmap::kARGB_8888_Config, 0xFFFFFFFF);
         SkDevice deferredDevice(deferredStore);
-        SkDeferredCanvas deferredCanvas(&deferredDevice);
+        SkAutoTUnref<SkDeferredCanvas> deferredCanvas(
+#if SK_DEFERRED_CANVAS_USES_FACTORIES
+            SkDeferredCanvas::Create(&deferredDevice));
+#else
+            SkNEW_ARGS(SkDeferredCanvas, (&deferredDevice)));
+#endif
         testStep->setAssertMessageFormat(kDeferredDrawAssertMessageFormat);
-        testStep->draw(&deferredCanvas, reporter);
+        testStep->draw(deferredCanvas, reporter);
         testStep->setAssertMessageFormat(kDeferredPreFlushAssertMessageFormat);
-        AssertCanvasStatesEqual(reporter, &deferredCanvas, &referenceCanvas,
+        AssertCanvasStatesEqual(reporter, deferredCanvas, &referenceCanvas,
             testStep);
 
         if (silent) {
-            deferredCanvas.silentFlush();
+            deferredCanvas->silentFlush();
         } else {
-            deferredCanvas.flush();
+            deferredCanvas->flush();
         }
 
         testStep->setAssertMessageFormat(
             silent ? kDeferredPostSilentFlushPlaybackAssertMessageFormat :
             kDeferredPostFlushPlaybackAssertMessageFormat);
         AssertCanvasStatesEqual(reporter,
-            deferredCanvas.immediateCanvas(),
+            deferredCanvas->immediateCanvas(),
             &referenceCanvas, testStep);
 
         // Verified that deferred canvas state is not affected by flushing
         // pending draw operations
 
         // The following test code is commented out because it currently fails.
         // Issue: http://code.google.com/p/skia/issues/detail?id=496
         /*
         testStep->setAssertMessageFormat(kDeferredPostFlushAssertMessageFormat);
         AssertCanvasStatesEqual(reporter, &deferredCanvas, &referenceCanvas,
@@ skipping 115 matching lines @@
             TestPdfDevice(reporter, testStepArray()[testStep]);
         }
     }
 
     // Explicitly call reset(), so we don't leak the pixels (since kTestBitmap is a global)
     kTestBitmap.reset();
 }
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS("Canvas", TestCanvasClass, TestCanvas)