Remove DEPRECATED_beginRecording().

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
  *      a single or a small group of canvas API calls. Each test step is
@@ skipping 103 matching lines @@
 static const int kHeight = 2;
 
 // Format strings that describe the test context.  The %s token is where
 // the name of the test step is inserted.  The context is required for
 // disambiguating the error in the case of failures that are reported in
 // functions that are called multiple times in different contexts (test
 // cases and test steps).
 static const char* const kDefaultAssertMessageFormat = "%s";
 static const char* const kCanvasDrawAssertMessageFormat =
     "Drawing test step %s with SkCanvas";
-static const char* const kPictureDrawAssertMessageFormat =
-    "Drawing test step %s with SkPicture";
-static const char* const kPictureSecondDrawAssertMessageFormat =
-    "Duplicate draw of test step %s with SkPicture";
 static const char* const kDeferredDrawAssertMessageFormat =
     "Drawing test step %s with SkDeferredCanvas";
 static const char* const kProxyDrawAssertMessageFormat =
     "Drawing test step %s with SkProxyCanvas";
 static const char* const kNWayDrawAssertMessageFormat =
     "Drawing test step %s with SkNWayCanvas";
 static const char* const kDeferredPreFlushAssertMessageFormat =
     "test step %s, SkDeferredCanvas state consistency before flush";
 static const char* const kDeferredPostFlushPlaybackAssertMessageFormat =
     "test step %s, SkDeferredCanvas playback canvas state consistency after flush";
 static const char* const kDeferredPostSilentFlushPlaybackAssertMessageFormat =
     "test step %s, SkDeferredCanvas playback canvas state consistency after silent flush";
-static const char* const kPictureResourceReuseMessageFormat =
-    "test step %s, SkPicture duplicate flattened object test";
 static const char* const kProxyStateAssertMessageFormat =
     "test step %s, SkProxyCanvas state consistency";
 static const char* const kProxyIndirectStateAssertMessageFormat =
     "test step %s, SkProxyCanvas indirect canvas state consistency";
 static const char* const kNWayStateAssertMessageFormat =
     "test step %s, SkNWayCanvas state consistency";
 static const char* const kNWayIndirect1StateAssertMessageFormat =
     "test step %s, SkNWayCanvas indirect canvas 1 state consistency";
 static const char* const kNWayIndirect2StateAssertMessageFormat =
     "test step %s, SkNWayCanvas indirect canvas 2 state consistency";
@@ skipping 304 matching lines @@
     canvas->drawVertices(SkCanvas::kTriangleFan_VertexMode, 4, pts, pts,
                          NULL, NULL, NULL, 0, paint);
 }
 // NYI: issue 240.
 TEST_STEP_NO_PDF(DrawVerticesShader, DrawVerticesShaderTestStep);
 
 static void DrawPictureTestStep(SkCanvas* canvas,
                                 skiatest::Reporter*,
                                 CanvasTestStep*) {
     SkPictureRecorder recorder;
-    SkCanvas* testCanvas = recorder.beginRecording(SkIntToScalar(kWidth), SkIntToScalar(kHeight), 
+    SkCanvas* testCanvas = recorder.beginRecording(SkIntToScalar(kWidth), SkIntToScalar(kHeight),
                                                    NULL, 0);
     testCanvas->scale(SkIntToScalar(2), SkIntToScalar(1));
     testCanvas->clipRect(kTestRect);
     testCanvas->drawRect(kTestRect, kTestPaint);
     SkAutoTUnref<SkPicture> testPicture(recorder.endRecording());
 
     canvas->drawPicture(testPicture);
 }
 TEST_STEP(DrawPicture, DrawPictureTestStep);
 
@@ skipping 194 matching lines @@
                 testStep->assertMessage());
             for (int i = 0; i < referenceRecord->fPathHeap->count(); ++i) {
                 REPORTER_ASSERT_MESSAGE(reporter,
                     (*referenceRecord->fPathHeap)[i] ==
                     (*testRecord->fPathHeap)[i], testStep->assertMessage());
             }
         }
         */
 
     }
-
-public:
-
-    static void TestPictureFlattenedObjectReuse(skiatest::Reporter* reporter,
-                                                CanvasTestStep* testStep,
-                                                uint32_t recordFlags) {
-        // Verify that when a test step is executed twice, no extra resources
-        // are flattened during the second execution
-        testStep->setAssertMessageFormat(kPictureDrawAssertMessageFormat);
-        SkPictureRecorder referenceRecorder;
-        SkCanvas* referenceCanvas =
-            referenceRecorder.DEPRECATED_beginRecording(SkIntToScalar(kWidth), 
-                                                        SkIntToScalar(kHeight), 
-                                                        NULL, recordFlags);
-        testStep->draw(referenceCanvas, reporter);
-
-        SkPictureRecorder testRecorder;
-        SkCanvas* testCanvas =
-            testRecorder.DEPRECATED_beginRecording(SkIntToScalar(kWidth), 
-                                                   SkIntToScalar(kHeight), 
-                                                   NULL, recordFlags);
-        testStep->draw(testCanvas, reporter);
-        testStep->setAssertMessageFormat(kPictureSecondDrawAssertMessageFormat);
-        testStep->draw(testCanvas, reporter);
-
-        SkPictureRecord* referenceRecord = static_cast<SkPictureRecord*>(referenceCanvas);
-        SkPictureRecord* testRecord = static_cast<SkPictureRecord*>(testCanvas);
-        testStep->setAssertMessageFormat(kPictureResourceReuseMessageFormat);
-        AssertFlattenedObjectsEqual(referenceRecord, testRecord,
-                                    reporter, testStep);
-    }
 };
 
 static void TestPdfDevice(skiatest::Reporter* reporter,
                           CanvasTestStep* testStep) {
     SkISize pageSize = SkISize::Make(kWidth, kHeight);
     SkPDFDevice device(pageSize, pageSize, SkMatrix::I());
     SkCanvas canvas(&device);
     testStep->setAssertMessageFormat(kPdfAssertMessageFormat);
     testStep->draw(&canvas, reporter);
     SkPDFDocument doc;
@@ skipping 179 matching lines @@
     SkDELETE(canvas);
 }
 
 DEF_TEST(Canvas, reporter) {
     // Init global here because bitmap pixels cannot be alocated during
     // static initialization
     kTestBitmap = testBitmap();
 
     for (int testStep = 0; testStep < testStepArray().count(); testStep++) {
         TestOverrideStateConsistency(reporter, testStepArray()[testStep]);
-        SkPictureTester::TestPictureFlattenedObjectReuse(reporter,
-            testStepArray()[testStep], 0);
         if (testStepArray()[testStep]->enablePdfTesting()) {
             TestPdfDevice(reporter, testStepArray()[testStep]);
         }
     }
 
     // Explicitly call reset(), so we don't leak the pixels (since kTestBitmap is a global)
     kTestBitmap.reset();
 
     test_newraster(reporter);
 }