Staged removal of SkPicture-derived classes

tests/CanvasTest.cpp

Index: tests/CanvasTest.cpp
===================================================================
--- tests/CanvasTest.cpp	(revision 14237)
+++ tests/CanvasTest.cpp	(working copy)
@@ -496,7 +496,7 @@
                                 skiatest::Reporter*,
                                 CanvasTestStep*) {
     SkPictureRecorder recorder;
-    SkCanvas* testCanvas = recorder.beginRecording(kWidth, kHeight);
+    SkCanvas* testCanvas = recorder.beginRecording(kWidth, kHeight, NULL, 0);
     testCanvas->scale(SkIntToScalar(2), SkIntToScalar(1));
     testCanvas->clipRect(kTestRect);
     testCanvas->drawRect(kTestRect, kTestPaint);
@@ -724,13 +724,13 @@
         // are flattened during the second execution
         testStep->setAssertMessageFormat(kPictureDrawAssertMessageFormat);
         SkPictureRecorder referenceRecorder;
-        SkCanvas* referenceCanvas = referenceRecorder.beginRecording(kWidth,
-                                                                     kHeight, recordFlags);
+        SkCanvas* referenceCanvas = referenceRecorder.beginRecording(kWidth, kHeight, 
+                                                                     NULL, recordFlags);
         testStep->draw(referenceCanvas, reporter);
 
         SkPictureRecorder testRecorder;
-        SkCanvas* testCanvas = testRecorder.beginRecording(kWidth,
-                                                           kHeight, recordFlags);
+        SkCanvas* testCanvas = testRecorder.beginRecording(kWidth, kHeight, 
+                                                           NULL, recordFlags);
         testStep->draw(testCanvas, reporter);
         testStep->setAssertMessageFormat(kPictureSecondDrawAssertMessageFormat);
         testStep->draw(testCanvas, reporter);