Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(556)

Unified Diff: tests/PictureTest.cpp

Issue 313613002: Remove legacy picture recording (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Remove dead files from core.gypi Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« include/core/SkPictureRecorder.h ('K') | « src/core/SkTileGridPicture.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/PictureTest.cpp
diff --git a/tests/PictureTest.cpp b/tests/PictureTest.cpp
index d27b4635838d2991886960864c7b921d293f52b5..494b4ed8d420d9262da37c6287aa8a212d5c1413 100644
--- a/tests/PictureTest.cpp
+++ b/tests/PictureTest.cpp
@@ -1103,49 +1103,6 @@ static void test_unbalanced_save_restores(skiatest::Reporter* reporter) {
REPORTER_ASSERT(reporter, 4 == testCanvas.getSaveCount());
REPORTER_ASSERT(reporter, testCanvas.getTotalMatrix().isIdentity());
}
-
-#if defined(SK_SUPPORT_LEGACY_PICTURE_CAN_RECORD) && \
- defined(SK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES)
- set_canvas_to_save_count_4(&testCanvas);
-
- // Due to "fake" endRecording, the old SkPicture recording interface
- // allowed unbalanced saves/restores to leak out. This sub-test checks
- // that the situation has been remedied.
- {
- SkPicture p;
-
- SkCanvas* canvas = p.beginRecording(100, 100);
- for (int i = 0; i < 4; ++i) {
- canvas->save();
- }
- SkRect r = SkRect::MakeWH(50, 50);
- SkPaint paint;
- canvas->drawRect(r, paint);
-
- // Check that copying a mid-recording picture does not result in unbalanced saves/restores
- SkPicture p2(p);
-
- testCanvas.drawPicture(p2);
- REPORTER_ASSERT(reporter, 4 == testCanvas.getSaveCount());
- set_canvas_to_save_count_4(&testCanvas);
-
- // Check that cloning a mid-recording picture does not result in unbalanced saves/restores
- SkAutoTUnref<SkPicture> p3(p.clone());
- testCanvas.drawPicture(*p3);
- REPORTER_ASSERT(reporter, 4 == testCanvas.getSaveCount());
- set_canvas_to_save_count_4(&testCanvas);
-
- // Check that serializing a mid-recording picture doesn't result in unbalanced
- // saves/restores
- SkDynamicMemoryWStream wStream;
- p.serialize(&wStream);
- SkAutoDataUnref data(wStream.copyToData());
- SkMemoryStream stream(data);
- SkAutoTUnref<SkPicture> p4(SkPicture::CreateFromStream(&stream, NULL));
- testCanvas.drawPicture(*p4);
- REPORTER_ASSERT(reporter, 4 == testCanvas.getSaveCount());
- }
-#endif
}
static void test_peephole() {
« include/core/SkPictureRecorder.h ('K') | « src/core/SkTileGridPicture.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698