Remove SkCanvas::isDrawingToLayer

BUG=3245

Review URL: https://codereview.chromium.org/803913005

2 files changed, 0 insertions, 61 deletions

diff --git a/tests/CanvasTest.cpp b/tests/CanvasTest.cpp
index 1f8f2760b5..b55f833a52 100644
--- a/tests/CanvasTest.cpp
+++ b/tests/CanvasTest.cpp
@@ -471,39 +471,6 @@ static void SaveRestoreTestStep(SkCanvas* canvas, const TestData& d,
 }
 TEST_STEP(SaveRestore, SaveRestoreTestStep);
 
-static void DrawLayerTestStep(SkCanvas* canvas, const TestData& d,
-                              skiatest::Reporter* reporter, CanvasTestStep* testStep) {
-    REPORTER_ASSERT_MESSAGE(reporter, !canvas->isDrawingToLayer(),
-        testStep->assertMessage());
-    canvas->save();
-    REPORTER_ASSERT_MESSAGE(reporter, !canvas->isDrawingToLayer(),
-        testStep->assertMessage());
-    canvas->restore();
-
-    const SkRect* bounds = NULL;    // null means include entire bounds
-    const SkPaint* paint = NULL;
-
-    canvas->saveLayer(bounds, paint);
-    REPORTER_ASSERT_MESSAGE(reporter, canvas->isDrawingToLayer(),
-        testStep->assertMessage());
-    canvas->restore();
-    REPORTER_ASSERT_MESSAGE(reporter, !canvas->isDrawingToLayer(),
-        testStep->assertMessage());
-
-    canvas->saveLayer(bounds, paint);
-    canvas->saveLayer(bounds, paint);
-    REPORTER_ASSERT_MESSAGE(reporter, canvas->isDrawingToLayer(),
-        testStep->assertMessage());
-    canvas->restore();
-    REPORTER_ASSERT_MESSAGE(reporter, canvas->isDrawingToLayer(),
-        testStep->assertMessage());
-    canvas->restore();
-    // now layer count should be 0
-    REPORTER_ASSERT_MESSAGE(reporter, !canvas->isDrawingToLayer(),
-        testStep->assertMessage());
-}
-TEST_STEP(DrawLayer, DrawLayerTestStep);
-
 static void NestedSaveRestoreWithSolidPaintTestStep(SkCanvas* canvas, const TestData& d,
                                                     skiatest::Reporter*, CanvasTestStep*) {
     // This test step challenges the TestDeferredCanvasStateConsistency
@@ -551,8 +518,6 @@ static void AssertCanvasStatesEqual(skiatest::Reporter* reporter, const TestData
         canvas2->getDeviceSize(), testStep->assertMessage());
     REPORTER_ASSERT_MESSAGE(reporter, canvas1->getSaveCount() ==
         canvas2->getSaveCount(), testStep->assertMessage());
-    REPORTER_ASSERT_MESSAGE(reporter, canvas1->isDrawingToLayer() ==
-        canvas2->isDrawingToLayer(), testStep->assertMessage());
 
     SkRect bounds1, bounds2;
     REPORTER_ASSERT_MESSAGE(reporter,
diff --git a/tests/RecorderTest.cpp b/tests/RecorderTest.cpp
index 7a2755699f..e0abacef38 100644
--- a/tests/RecorderTest.cpp
+++ b/tests/RecorderTest.cpp
@@ -125,32 +125,6 @@ DEF_TEST(Recorder_RefPictures, r) {
     REPORTER_ASSERT(r, pic->unique());
 }
 
-DEF_TEST(Recorder_IsDrawingToLayer, r) {
-    SkRecord record;
-    SkRecorder recorder(&record, 100, 100);
-
-    // We'll save, saveLayer, save, and saveLayer, then restore them all,
-    // checking that isDrawingToLayer() is correct at each step.
-
-    REPORTER_ASSERT(r, !recorder.isDrawingToLayer());
-    recorder.save();
-        REPORTER_ASSERT(r, !recorder.isDrawingToLayer());
-        recorder.saveLayer(NULL, NULL);
-            REPORTER_ASSERT(r, recorder.isDrawingToLayer());
-            recorder.save();
-                REPORTER_ASSERT(r, recorder.isDrawingToLayer());
-                recorder.saveLayer(NULL, NULL);
-                    REPORTER_ASSERT(r, recorder.isDrawingToLayer());
-                recorder.restore();
-                REPORTER_ASSERT(r, recorder.isDrawingToLayer());
-            recorder.restore();
-            REPORTER_ASSERT(r, recorder.isDrawingToLayer());
-        recorder.restore();
-        REPORTER_ASSERT(r, !recorder.isDrawingToLayer());
-    recorder.restore();
-    REPORTER_ASSERT(r, !recorder.isDrawingToLayer());
-}
-
 DEF_TEST(Recorder_drawImage_takeReference, reporter) {
 
     SkAutoTUnref<SkImage> image;