diff options
| author |  Mike Reed <reed@google.com> | 2016-12-09 09:00:50 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-09 14:33:41 +0000 |
| commit | c1f7774e8d327e3c98b4094c9c01d26e27013f71 (patch) | |
| tree | 202eecd519054c880daa6995876abb5d42fdbc89 /gm/convexpolyclip.cpp | |
| parent | 374e04acfa00da3c20a29d391b3e7305e37fbcfb (diff) | |
Revert[2] "remove SK_SUPPORT_LEGACY_CLIP_REGIONOPS"
This reverts commit a129dfef2aaab0b5995cdf1ab7b2cdd41c29cf72.
BUG=skia:
Change-Id: I717de6e5fcd4516aa684b014b1414b0f82ac2b91
Reviewed-on: https://skia-review.googlesource.com/5722
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Diffstat (limited to 'gm/convexpolyclip.cpp')
| -rw-r--r-- | gm/convexpolyclip.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gm/convexpolyclip.cpp b/gm/convexpolyclip.cpp index 5116955021..5a8844abe2 100644 --- a/gm/convexpolyclip.cpp +++ b/gm/convexpolyclip.cpp @@ -173,7 +173,7 @@ protected: canvas->save(); } canvas->translate(x, y); - clip->setOnCanvas(canvas, SkCanvas::kIntersect_Op, SkToBool(aa)); + clip->setOnCanvas(canvas, kIntersect_SkClipOp, SkToBool(aa)); canvas->drawBitmap(fBmp, 0, 0); canvas->restore(); x += fBmp.width() + kMargin; @@ -199,7 +199,7 @@ protected: SkPath closedClipPath; clip->asClosedPath(&closedClipPath); canvas->drawPath(closedClipPath, clipOutlinePaint); - clip->setOnCanvas(canvas, SkCanvas::kIntersect_Op, SkToBool(aa)); + clip->setOnCanvas(canvas, kIntersect_SkClipOp, SkToBool(aa)); canvas->scale(1.f, 1.8f); canvas->drawText(kTxt, SK_ARRAY_COUNT(kTxt)-1, 0, 1.5f * txtPaint.getTextSize(), @@ -227,7 +227,7 @@ private: Clip () : fClipType(kNone_ClipType) {} - void setOnCanvas(SkCanvas* canvas, SkCanvas::ClipOp op, bool aa) const { + void setOnCanvas(SkCanvas* canvas, SkClipOp op, bool aa) const { switch (fClipType) { case kPath_ClipType: canvas->clipPath(fPath, op, aa); |