aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/utils
diff options
context:
space:
mode:
authorGravatar Mike Reed <reed@google.com>2016-12-09 09:00:50 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2016-12-09 14:33:41 +0000
commitc1f7774e8d327e3c98b4094c9c01d26e27013f71 (patch)
tree202eecd519054c880daa6995876abb5d42fdbc89 /include/utils
parent374e04acfa00da3c20a29d391b3e7305e37fbcfb (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 'include/utils')
-rw-r--r--include/utils/SkDumpCanvas.h8
-rw-r--r--include/utils/SkLuaCanvas.h8
-rw-r--r--include/utils/SkNWayCanvas.h8
3 files changed, 12 insertions, 12 deletions
diff --git a/include/utils/SkDumpCanvas.h b/include/utils/SkDumpCanvas.h
index c2152f23d8..c8f977ec10 100644
--- a/include/utils/SkDumpCanvas.h
+++ b/include/utils/SkDumpCanvas.h
@@ -117,10 +117,10 @@ protected:
const uint16_t indices[], int indexCount,
const SkPaint&) override;
- void onClipRect(const SkRect&, ClipOp, ClipEdgeStyle) override;
- void onClipRRect(const SkRRect&, ClipOp, ClipEdgeStyle) override;
- void onClipPath(const SkPath&, ClipOp, ClipEdgeStyle) override;
- void onClipRegion(const SkRegion&, ClipOp) override;
+ void onClipRect(const SkRect&, SkClipOp, ClipEdgeStyle) override;
+ void onClipRRect(const SkRRect&, SkClipOp, ClipEdgeStyle) override;
+ void onClipPath(const SkPath&, SkClipOp, ClipEdgeStyle) override;
+ void onClipRegion(const SkRegion&, SkClipOp) override;
void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) override;
void onDrawAnnotation(const SkRect&, const char key[], SkData* value) override;
diff --git a/include/utils/SkLuaCanvas.h b/include/utils/SkLuaCanvas.h
index c03a1f0afc..357ddc81da 100644
--- a/include/utils/SkLuaCanvas.h
+++ b/include/utils/SkLuaCanvas.h
@@ -63,10 +63,10 @@ protected:
const uint16_t indices[], int indexCount,
const SkPaint&) override;
- void onClipRect(const SkRect&, ClipOp, ClipEdgeStyle) override;
- void onClipRRect(const SkRRect&, ClipOp, ClipEdgeStyle) override;
- void onClipPath(const SkPath&, ClipOp, ClipEdgeStyle) override;
- void onClipRegion(const SkRegion&, ClipOp) override;
+ void onClipRect(const SkRect&, SkClipOp, ClipEdgeStyle) override;
+ void onClipRRect(const SkRRect&, SkClipOp, ClipEdgeStyle) override;
+ void onClipPath(const SkPath&, SkClipOp, ClipEdgeStyle) override;
+ void onClipRegion(const SkRegion&, SkClipOp) override;
void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) override;
diff --git a/include/utils/SkNWayCanvas.h b/include/utils/SkNWayCanvas.h
index d8856dad0b..3ed7d4c41a 100644
--- a/include/utils/SkNWayCanvas.h
+++ b/include/utils/SkNWayCanvas.h
@@ -76,10 +76,10 @@ protected:
const uint16_t indices[], int indexCount,
const SkPaint&) override;
- void onClipRect(const SkRect&, ClipOp, ClipEdgeStyle) override;
- void onClipRRect(const SkRRect&, ClipOp, ClipEdgeStyle) override;
- void onClipPath(const SkPath&, ClipOp, ClipEdgeStyle) override;
- void onClipRegion(const SkRegion&, ClipOp) override;
+ void onClipRect(const SkRect&, SkClipOp, ClipEdgeStyle) override;
+ void onClipRRect(const SkRRect&, SkClipOp, ClipEdgeStyle) override;
+ void onClipPath(const SkPath&, SkClipOp, ClipEdgeStyle) override;
+ void onClipRegion(const SkRegion&, SkClipOp) override;
void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) override;
void onDrawAnnotation(const SkRect&, const char[], SkData*) override;