diff options
author | mtklein <mtklein@chromium.org> | 2014-08-21 13:07:27 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-08-21 13:07:27 -0700 |
commit | c92e550d3656abaf83b134b158756b940d58a907 (patch) | |
tree | 60863ff9019859f3ec644bb4a8fd7a188b93609d /tests | |
parent | 8ebdd99bb1c2c1687c9ad8f5344c75070394f23a (diff) |
Install a hook to swap between SkPicture backends with a single define.
BUG=skia:
R=robertphillips@google.com, reed@google.com, mtklein@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/492023002
Diffstat (limited to 'tests')
-rw-r--r-- | tests/CanvasTest.cpp | 8 | ||||
-rw-r--r-- | tests/PictureTest.cpp | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/tests/CanvasTest.cpp b/tests/CanvasTest.cpp index 217cf0349e..5d6a8d8a6f 100644 --- a/tests/CanvasTest.cpp +++ b/tests/CanvasTest.cpp @@ -687,13 +687,13 @@ public: // are flattened during the second execution testStep->setAssertMessageFormat(kPictureDrawAssertMessageFormat); SkPictureRecorder referenceRecorder; - SkCanvas* referenceCanvas = referenceRecorder.beginRecording(kWidth, kHeight, - NULL, recordFlags); + SkCanvas* referenceCanvas = + referenceRecorder.DEPRECATED_beginRecording(kWidth, kHeight, NULL, recordFlags); testStep->draw(referenceCanvas, reporter); SkPictureRecorder testRecorder; - SkCanvas* testCanvas = testRecorder.beginRecording(kWidth, kHeight, - NULL, recordFlags); + SkCanvas* testCanvas = + testRecorder.DEPRECATED_beginRecording(kWidth, kHeight, NULL, recordFlags); testStep->draw(testCanvas, reporter); testStep->setAssertMessageFormat(kPictureSecondDrawAssertMessageFormat); testStep->draw(testCanvas, reporter); diff --git a/tests/PictureTest.cpp b/tests/PictureTest.cpp index cb29b37dc7..c87d9c75ca 100644 --- a/tests/PictureTest.cpp +++ b/tests/PictureTest.cpp @@ -580,7 +580,7 @@ static void test_gatherpixelrefs(skiatest::Reporter* reporter) { #define GENERATE_CANVAS(recorder, x) \ (x) ? recorder.EXPERIMENTAL_beginRecording(100, 100) \ - : recorder.beginRecording(100,100); + : recorder. DEPRECATED_beginRecording(100,100); /* Hit a few SkPicture::Analysis cases not handled elsewhere. */ static void test_analysis(skiatest::Reporter* reporter, bool useNewPath) { @@ -897,7 +897,7 @@ static void test_gpu_picture_optimization(skiatest::Reporter* reporter, { SkPictureRecorder recorder; - SkCanvas* c = recorder.beginRecording(kWidth, kHeight); + SkCanvas* c = recorder.DEPRECATED_beginRecording(kWidth, kHeight); // 1) c->saveLayer(NULL, NULL); c->restore(); @@ -1002,7 +1002,7 @@ static void test_gpu_picture_optimization(skiatest::Reporter* reporter, static void test_has_text(skiatest::Reporter* reporter, bool useNewPath) { SkPictureRecorder recorder; #define BEGIN_RECORDING useNewPath ? recorder.EXPERIMENTAL_beginRecording(100, 100) \ - : recorder. beginRecording(100, 100) + : recorder. DEPRECATED_beginRecording(100, 100) SkCanvas* canvas = BEGIN_RECORDING; { |