re-disable save/restore peephole optimization
BUG=skia:5548, 629408
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2163283002
Review-Url: https://codereview.chromium.org/2163283002
diff --git a/src/core/SkRecordOpts.cpp b/src/core/SkRecordOpts.cpp
index aa07fac..d51785b 100644
--- a/src/core/SkRecordOpts.cpp
+++ b/src/core/SkRecordOpts.cpp
@@ -276,7 +276,10 @@
// out junk for other optimization passes. Right now, nothing needs it,
// and the bounding box hierarchy will do the work of skipping no-op
// Save-NoDraw-Restore sequences better than we can here.
- SkRecordNoopSaveRestores(record);
+ // As there is a known problem with this peephole and drawAnnotation, disable this.
+ // If we want to enable this we must first fix this bug:
+ // https://bugs.chromium.org/p/skia/issues/detail?id=5548
+// SkRecordNoopSaveRestores(record);
SkRecordNoopSaveLayerDrawRestores(record);
SkRecordMergeSvgOpacityAndFilterLayers(record);
diff --git a/tests/PictureTest.cpp b/tests/PictureTest.cpp
index b1644e7..b024916 100644
--- a/tests/PictureTest.cpp
+++ b/tests/PictureTest.cpp
@@ -1246,6 +1246,8 @@
///////////////////////////////////////////////////////////////////////////////////////////////////
+// Disable until we properly fix https://bugs.chromium.org/p/skia/issues/detail?id=5548
+#if 0
static void empty_ops(SkCanvas* canvas) {
}
static void clip_ops(SkCanvas* canvas) {
@@ -1303,3 +1305,5 @@
}
}
}
+#endif
+