aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/utils/SkCanvasStateUtils.cpp
diff options
context:
space:
mode:
authorGravatar Mike Reed <reed@google.com>2016-12-09 13:14:25 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2016-12-09 13:14:41 +0000
commita129dfef2aaab0b5995cdf1ab7b2cdd41c29cf72 (patch)
tree9398e074cf0408ba24f739130c062b2bfbe4435e /src/utils/SkCanvasStateUtils.cpp
parent76073c11040204d51dceb49cbd0b05be8e7fd0a2 (diff)
Revert "remove SK_SUPPORT_LEGACY_CLIP_REGIONOPS"
This reverts commit 8e7432b7f98dd592e529a0c8bb038d73ebfb0478. Reason for revert: <INSERT REASONING HERE> external/skia/bench/../tools/android/SkAndroidSDKCanvas.h:103:36: error: C++ requires a type specifier for all declarations void onClipRect(const SkRect&, ClipOp, ClipEdgeStyle) override; Original change's description: > remove SK_SUPPORT_LEGACY_CLIP_REGIONOPS > > > switch over to SkClipOps now that SK_SUPPORT_LEGACY_CLIP_REGIONOPS is gone > > BUG=skia: > > Change-Id: Ifdc8b3746d508348a40cc009a4e529a1cb3c405d > Reviewed-on: https://skia-review.googlesource.com/5714 > Commit-Queue: Mike Reed <reed@google.com> > Reviewed-by: Mike Reed <reed@google.com> > TBR=reed@google.com,reviews@skia.org BUG=skia: NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: If26ea91d7464615e43c1d3d2f726e337ff56b55c Reviewed-on: https://skia-review.googlesource.com/5721 Commit-Queue: Mike Reed <reed@google.com> Reviewed-by: Mike Reed <reed@google.com>
Diffstat (limited to 'src/utils/SkCanvasStateUtils.cpp')
-rw-r--r--src/utils/SkCanvasStateUtils.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/utils/SkCanvasStateUtils.cpp b/src/utils/SkCanvasStateUtils.cpp
index 19917273c7..d31eaa632c 100644
--- a/src/utils/SkCanvasStateUtils.cpp
+++ b/src/utils/SkCanvasStateUtils.cpp
@@ -135,15 +135,15 @@ public:
bool failed() { return fFailed; }
// ClipVisitor
- void clipRect(const SkRect& rect, SkClipOp op, bool antialias) override {
+ void clipRect(const SkRect& rect, SkCanvas::ClipOp op, bool antialias) override {
fFailed |= antialias;
}
- void clipRRect(const SkRRect& rrect, SkClipOp op, bool antialias) override {
+ void clipRRect(const SkRRect& rrect, SkCanvas::ClipOp op, bool antialias) override {
fFailed |= antialias;
}
- void clipPath(const SkPath&, SkClipOp, bool antialias) override {
+ void clipPath(const SkPath&, SkCanvas::ClipOp, bool antialias) override {
fFailed |= antialias;
}
@@ -275,7 +275,7 @@ static void setup_canvas_from_MC_state(const SkMCState& state, SkCanvas* canvas)
}
canvas->setMatrix(matrix);
- canvas->clipRegion(clip, kReplace_SkClipOp);
+ canvas->clipRegion(clip, SkCanvas::kReplace_Op);
}
static std::unique_ptr<SkCanvas>