diff options
| -rw-r--r-- | src/core/SkRecordOpts.cpp | 5 | ||||
| -rw-r--r-- | tests/PictureTest.cpp | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/core/SkRecordOpts.cpp b/src/core/SkRecordOpts.cpp index aa07facb19..d51785bd54 100644 --- a/src/core/SkRecordOpts.cpp +++ b/src/core/SkRecordOpts.cpp @@ -276,7 +276,10 @@ void SkRecordOptimize(SkRecord* record) { // 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 b1644e74ae..b02491661e 100644 --- a/tests/PictureTest.cpp +++ b/tests/PictureTest.cpp @@ -1246,6 +1246,8 @@ DEF_TEST(PictureGpuAnalyzer, r) { /////////////////////////////////////////////////////////////////////////////////////////////////// +// 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 @@ DEF_TEST(Picture_RecordEmpty, r) { } } } +#endif + |