Sketch SkPictureRecorder::optimizeFor(GrContext*).

src/core/SkPictureCommon.h

Index: src/core/SkPictureCommon.h
diff --git a/src/core/SkPictureCommon.h b/src/core/SkPictureCommon.h
index 1c38b049fa7314771a5c06f6762e696cd666f831..0a0c6b5ca96ef277c07e6a3d5d89fd105f50d77b 100644
--- a/src/core/SkPictureCommon.h
+++ b/src/core/SkPictureCommon.h
@@ -45,18 +45,12 @@ struct SkBitmapHunter {
 
     // Most draws-type ops have paints.
     template <typename T>
-    static SK_WHEN(T::kTags & SkRecords::kDraw_Tag, bool) CheckPaint(const T& op) {
+    static SK_WHEN(T::kTags & SkRecords::kHasPaint_Tag, bool) CheckPaint(const T& op) {
         return PaintHasBitmap(AsPtr(op.paint));
     }
 
-    // SaveLayers also have a paint to check.
-    static bool CheckPaint(const SkRecords::SaveLayer& op) {
-        return PaintHasBitmap(AsPtr(op.paint));
-    }
-
-    // Shouldn't be any non-Draw non-SaveLayer ops with paints.
     template <typename T>
-    static SK_WHEN(!(T::kTags & SkRecords::kDraw_Tag), bool) CheckPaint(const T&) {
+    static SK_WHEN(!(T::kTags & SkRecords::kHasPaint_Tag), bool) CheckPaint(const T&) {
         return false;
     }