commit 2f6e2f841069b895c92bfa0381ad9120b59bd2b9
author Michael Ludwig <michaelludwig@google.com> Tue Aug 03 13:08:50 2021 -0400
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Tue Aug 03 18:08:21 2021 +0000
tree 69a5288c7b2bed0003f13bb3b7375f28ca29a80b
parent 86b2c952ae941eb568d71769b68bb2d35d2ceb6d

Use SkClipOp::kFoo instead of kFoo_SkClipOp from SkClipOpPriv

The SkClipOpPriv.h header will be going away soon, but a number of
places still use its kIntersect_SkClipOp definitions instead of the
equivalent SkClipOp::kIntersect. Besides updating these references,
a number of unnecessary includes to SkClipOpPriv.h are removed and
some test cases exercising expanding clip ops are deleted since they
will be unnecessary shortly.

Bug: skia:10208
Change-Id: I2bbdd6bb39869134c6a80ef2b4482e6cabdeb0b7
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/436157
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Michael Ludwig <michaelludwig@google.com>

gm/complexclip_blur_tiled.cpp

diff --git a/gm/complexclip_blur_tiled.cpp b/gm/complexclip_blur_tiled.cpp
index 24aaea0..8e710cd 100644
--- a/gm/complexclip_blur_tiled.cpp
+++ b/gm/complexclip_blur_tiled.cpp
@@ -18,7 +18,6 @@
 #include "include/core/SkString.h"
 #include "include/core/SkSurface.h"
 #include "include/effects/SkImageFilters.h"
-#include "src/core/SkClipOpPriv.h"
 #include "tools/ToolUtils.h"
 
 #define WIDTH 512
@@ -57,7 +56,7 @@
                 SkRect rect = SkRect::MakeWH(WIDTH, HEIGHT);
                 tileCanvas->saveLayer(&rect, &blurPaint);
                 SkRRect rrect = SkRRect::MakeRectXY(rect.makeInset(20, 20), 25, 25);
-                tileCanvas->clipRRect(rrect, kDifference_SkClipOp, true);
+                tileCanvas->clipRRect(rrect, SkClipOp::kDifference, true);
                 SkPaint paint;
                 tileCanvas->drawRect(rect, paint);
                 tileCanvas->restore();