From 05a429614ec3206f9d2b7c145cbda0b5a442b6d0 Mon Sep 17 00:00:00 2001 From: Yuqian Li Date: Mon, 6 Mar 2017 15:47:09 -0500 Subject: Turn off savelayer optimization for Android framework This is a simpler version of https://skia-review.googlesource.com/c/8970/ Note that we couldn't do the optimization and add back the clip effect by another clipRect or clipPath call because the final matrix is not available at recording time. BUG=skia:6334 Change-Id: I3ca091bdc1ee1d265a79fb88d0a6f9afe2b27e58 Reviewed-on: https://skia-review.googlesource.com/9311 Reviewed-by: Mike Klein Reviewed-by: Mike Reed Commit-Queue: Yuqian Li --- tests/RecordOptsTest.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tests/RecordOptsTest.cpp') diff --git a/tests/RecordOptsTest.cpp b/tests/RecordOptsTest.cpp index f5f18f3b1c..f0b4b837fa 100644 --- a/tests/RecordOptsTest.cpp +++ b/tests/RecordOptsTest.cpp @@ -8,6 +8,7 @@ #include "Test.h" #include "RecordTestUtils.h" +#include "SkBlurImageFilter.h" #include "SkColorFilter.h" #include "SkRecord.h" #include "SkRecordOpts.h" @@ -100,6 +101,7 @@ DEF_TEST(RecordOpts_SaveSaveLayerRestoreRestore, r) { } } +#ifndef SK_BUILD_FOR_ANDROID_FRAMEWORK static void assert_savelayer_restore(skiatest::Reporter* r, SkRecord* record, int i, @@ -128,7 +130,6 @@ static void assert_savelayer_draw_restore(skiatest::Reporter* r, } } -#include "SkBlurImageFilter.h" DEF_TEST(RecordOpts_NoopSaveLayerDrawRestore, r) { SkRecord record; SkRecorder recorder(&record, W, H); @@ -194,6 +195,7 @@ DEF_TEST(RecordOpts_NoopSaveLayerDrawRestore, r) { recorder.restore(); assert_savelayer_draw_restore(r, &record, 18, false); } +#endif static void assert_merge_svg_opacity_and_filter_layers(skiatest::Reporter* r, SkRecord* record, -- cgit v1.2.3