add testing flag to ignore saveLayer bounds

BUG=skia:

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

3 files changed, 9 insertions, 5 deletions

diff --git a/tests/PictureTest.cpp b/tests/PictureTest.cpp
index b98cc4680e..a66185b95b 100644
--- a/tests/PictureTest.cpp
+++ b/tests/PictureTest.cpp
@@ -974,7 +974,7 @@ static void test_savelayer_extraction(skiatest::Reporter* reporter) {
     }
 
     // Now test out the SaveLayer extraction
-    {
+    if (!SkCanvas::Internal_Private_GetIgnoreSaveLayerBounds()) {
         SkPicture::AccelData::Key key = SkLayerInfo::ComputeKey();
 
         const SkPicture::AccelData* data = pict->EXPERIMENTAL_getAccelData(key);
diff --git a/tests/RecordDrawTest.cpp b/tests/RecordDrawTest.cpp
index e830af4b43..d306cad6e9 100644
--- a/tests/RecordDrawTest.cpp
+++ b/tests/RecordDrawTest.cpp
@@ -275,9 +275,11 @@ DEF_TEST(RecordDraw_SaveLayerBoundsAffectsClipBounds, r) {
     TestBBH bbh;
     SkRecordFillBounds(SkRect::MakeWH(50, 50), record, &bbh);
     REPORTER_ASSERT(r, bbh.fEntries.count() == 3);
-    REPORTER_ASSERT(r, sloppy_rect_eq(bbh.fEntries[0].bounds, SkRect::MakeLTRB(10, 10, 40, 40)));
-    REPORTER_ASSERT(r, sloppy_rect_eq(bbh.fEntries[1].bounds, SkRect::MakeLTRB(20, 20, 30, 30)));
-    REPORTER_ASSERT(r, sloppy_rect_eq(bbh.fEntries[2].bounds, SkRect::MakeLTRB(10, 10, 40, 40)));
+    if (!SkCanvas::Internal_Private_GetIgnoreSaveLayerBounds()) {
+        REPORTER_ASSERT(r, sloppy_rect_eq(bbh.fEntries[0].bounds, SkRect::MakeLTRB(10, 10, 40, 40)));
+        REPORTER_ASSERT(r, sloppy_rect_eq(bbh.fEntries[1].bounds, SkRect::MakeLTRB(20, 20, 30, 30)));
+        REPORTER_ASSERT(r, sloppy_rect_eq(bbh.fEntries[2].bounds, SkRect::MakeLTRB(10, 10, 40, 40)));
+    }
 }
 
 DEF_TEST(RecordDraw_drawImage, r){
diff --git a/tests/RecordOptsTest.cpp b/tests/RecordOptsTest.cpp
index cdc0350e53..dd5035b216 100644
--- a/tests/RecordOptsTest.cpp
+++ b/tests/RecordOptsTest.cpp
@@ -131,7 +131,9 @@ DEF_TEST(RecordOpts_NoopSaveLayerDrawRestore, r) {
     recorder.saveLayer(&bounds, NULL);
         recorder.drawRect(draw, goodDrawPaint);
     recorder.restore();
-    assert_savelayer_restore(r, &record, 0, false);
+    if (!SkCanvas::Internal_Private_GetIgnoreSaveLayerBounds()) {
+        assert_savelayer_restore(r, &record, 0, false);
+    }
 
     // SaveLayer/Restore removed: no bounds + no paint = no point.
     recorder.saveLayer(NULL, NULL);