commit b42a3279268b11f8c1128a8d11679e0e7edb219d
author Mike Reed <reed@google.com> Sat May 30 16:02:14 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Sun May 31 14:06:42 2020 +0000
tree 6bb67bd9cdb836d22c3778ee0ec5490a35b8122f
parent 94230f4b05242fbf027836436895a85cf1b3638b

hide savelayer's clipmask fields

Bug: skia:9208
Change-Id: Ieff64b3132e7bf4a51ce9d70ea2f1bad492616da
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/223923
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Mike Reed <reed@google.com>

gm/backdrop_imagefilter_croprect.cpp

diff --git a/gm/backdrop_imagefilter_croprect.cpp b/gm/backdrop_imagefilter_croprect.cpp
index a3f442b..d8611f9 100644
--- a/gm/backdrop_imagefilter_croprect.cpp
+++ b/gm/backdrop_imagefilter_croprect.cpp
@@ -54,8 +54,8 @@
         if (i == 1) {
             // Backdrop mode, so save a layer using the image filter as the backdrop to filter
             // content on initialization.
-            canvas->saveLayer({nullptr, nullptr, imageFilter.get(), nullptr, nullptr,
-                               SkCanvas::kInitWithPrevious_SaveLayerFlag});
+            canvas->saveLayer(SkCanvas::SaveLayerRec(nullptr, nullptr, imageFilter.get(),
+                                                     SkCanvas::kInitWithPrevious_SaveLayerFlag));
         }
 
         // Restore the saved layer (either a main layer that was just drawn into and needs to be

gm/imagefilters.cpp

diff --git a/gm/imagefilters.cpp b/gm/imagefilters.cpp
index 116d69f..09f84fb 100644
--- a/gm/imagefilters.cpp
+++ b/gm/imagefilters.cpp
@@ -134,7 +134,7 @@
         canvas->save();
         SkRRect rr = SkRRect::MakeRectXY(r.makeOffset(dx, dy), 20, 20);
         canvas->clipRRect(rr, true);
-        canvas->saveLayer({ &rr.getBounds(), nullptr, filters[i].get(), nullptr, nullptr, 0 });
+        canvas->saveLayer(SkCanvas::SaveLayerRec(&rr.getBounds(), nullptr, filters[i].get(), 0));
         canvas->drawColor(0x40FFFFFF);
         canvas->restore();
         canvas->restore();

gm/savelayer.cpp

diff --git a/gm/savelayer.cpp b/gm/savelayer.cpp
index 2f619d8..6108bde 100644
--- a/gm/savelayer.cpp
+++ b/gm/savelayer.cpp
@@ -50,7 +50,7 @@
     SkPaint paint;
     paint.setAlphaf(0.25f);
     SkRect rect = SkRect::MakeLTRB(l, t, r, b);
-    canvas->saveLayer({ &rect, &paint, nullptr, nullptr, nullptr,
+    canvas->saveLayer({ &rect, &paint, nullptr,
                         (SkCanvas::SaveLayerFlags) SkCanvasPriv::kDontClipToLayer_SaveLayerFlag });
 }
 
@@ -108,8 +108,8 @@
         canvas->translate(100 * i, 0);
         auto flag = i ?
                 (SkCanvas::SaveLayerFlags) SkCanvasPriv::kDontClipToLayer_SaveLayerFlag : 0;
-        canvas->saveLayer({ &rect1, &paint1, nullptr, nullptr, nullptr, flag});
-        canvas->saveLayer({ &rect2, &paint2, nullptr, nullptr, nullptr, flag});
+        canvas->saveLayer(SkCanvas::SaveLayerRec(&rect1, &paint1, nullptr, flag));
+        canvas->saveLayer(SkCanvas::SaveLayerRec(&rect2, &paint2, nullptr, flag));
         canvas->drawRect(rect3, paint3);
         canvas->restore();
         canvas->restore();
@@ -134,6 +134,7 @@
     canvas->restore();
 };
 
+#ifdef SK_SUPPORT_LEGACY_LAYERCLIPMASK
 static void draw_mask(SkCanvas* canvas, int size) {
     const SkScalar cx = size * SK_ScalarHalf,
                    cy = cx;
@@ -243,6 +244,7 @@
         }
     }
 }
+#endif
 
 DEF_SIMPLE_GM(savelayer_coverage, canvas, 500, 500) {
     canvas->saveLayer(nullptr, nullptr);
@@ -282,6 +284,7 @@
     canvas->restore();
 }
 
+#ifdef SK_SUPPORT_LEGACY_LAYERCLIPMASK
 DEF_SIMPLE_GM(savelayer_clipmask_maskfilter, canvas, 500, 500) {
     // Offscreen surface for making the clip mask and mask filter images
     auto surf = SkSurface::MakeRaster(SkImageInfo::MakeA8(100, 100));
@@ -340,6 +343,7 @@
     canvas->clear(SK_ColorWHITE);
     canvas->restore();
 }
+#endif
 
 static void draw_cell(SkCanvas* canvas, sk_sp<SkTextBlob> blob, SkColor c, SkScalar w, SkScalar h,
                       bool useDrawBehind) {