aboutsummaryrefslogtreecommitdiffhomepage
path: root/bench
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 /bench
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 'bench')
-rw-r--r--bench/AAClipBench.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/bench/AAClipBench.cpp b/bench/AAClipBench.cpp
index f3159b6168..f91216e965 100644
--- a/bench/AAClipBench.cpp
+++ b/bench/AAClipBench.cpp
@@ -59,9 +59,9 @@ protected:
canvas->save();
#if 1
if (fDoPath) {
- canvas->clipPath(fClipPath, kReplace_SkClipOp, fDoAA);
+ canvas->clipPath(fClipPath, SkCanvas::kReplace_Op, fDoAA);
} else {
- canvas->clipRect(fClipRect, kReplace_SkClipOp, fDoAA);
+ canvas->clipRect(fClipRect, SkCanvas::kReplace_Op, fDoAA);
}
canvas->drawRect(fDrawRect, paint);
@@ -130,7 +130,8 @@ protected:
SkASSERT(path.isConvex());
canvas->clipPath(path,
- 0 == depth ? kReplace_SkClipOp : kIntersect_SkClipOp,
+ 0 == depth ? SkCanvas::kReplace_Op :
+ SkCanvas::kIntersect_Op,
fDoAA);
if (kNestingDepth == depth) {