diff options
author | reed <reed@google.com> | 2016-09-20 08:42:38 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-09-20 08:42:39 -0700 |
commit | 73603f3c52ffd89fe9d035be827b566a0e7d3b79 (patch) | |
tree | 873793b81536379196233f313b1a093d02bdac0e /src/core/SkLiteDL.cpp | |
parent | cae1be5acc8148fc5cbadd8730ee7994e50a1a47 (diff) |
abstract name of clipping ops, to transtion to a more restricted set
SkRegion::Op --> SkCanvas::ClipOp (alias) --> SkClipOp
pre-CL needed in chrome : https://codereview.chromium.org/2355583002/
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2355483002
Review-Url: https://codereview.chromium.org/2355483002
Diffstat (limited to 'src/core/SkLiteDL.cpp')
-rw-r--r-- | src/core/SkLiteDL.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/core/SkLiteDL.cpp b/src/core/SkLiteDL.cpp index 227c2f30b6..3175447380 100644 --- a/src/core/SkLiteDL.cpp +++ b/src/core/SkLiteDL.cpp @@ -149,34 +149,34 @@ namespace { struct ClipPath final : Op { static const auto kType = Type::ClipPath; - ClipPath(const SkPath& path, SkRegion::Op op, bool aa) : path(path), op(op), aa(aa) {} - SkPath path; - SkRegion::Op op; - bool aa; + ClipPath(const SkPath& path, SkCanvas::ClipOp op, bool aa) : path(path), op(op), aa(aa) {} + SkPath path; + SkCanvas::ClipOp op; + bool aa; void draw(SkCanvas* c, const SkMatrix&) { c->clipPath(path, op, aa); } void makeThreadsafe() { make_threadsafe(&path, nullptr); } }; struct ClipRect final : Op { static const auto kType = Type::ClipRect; - ClipRect(const SkRect& rect, SkRegion::Op op, bool aa) : rect(rect), op(op), aa(aa) {} - SkRect rect; - SkRegion::Op op; - bool aa; + ClipRect(const SkRect& rect, SkCanvas::ClipOp op, bool aa) : rect(rect), op(op), aa(aa) {} + SkRect rect; + SkCanvas::ClipOp op; + bool aa; void draw(SkCanvas* c, const SkMatrix&) { c->clipRect(rect, op, aa); } }; struct ClipRRect final : Op { static const auto kType = Type::ClipRRect; - ClipRRect(const SkRRect& rrect, SkRegion::Op op, bool aa) : rrect(rrect), op(op), aa(aa) {} - SkRRect rrect; - SkRegion::Op op; - bool aa; + ClipRRect(const SkRRect& rrect, SkCanvas::ClipOp op, bool aa) : rrect(rrect), op(op), aa(aa) {} + SkRRect rrect; + SkCanvas::ClipOp op; + bool aa; void draw(SkCanvas* c, const SkMatrix&) { c->clipRRect(rrect, op, aa); } }; struct ClipRegion final : Op { static const auto kType = Type::ClipRegion; - ClipRegion(const SkRegion& region, SkRegion::Op op) : region(region), op(op) {} - SkRegion region; - SkRegion::Op op; + ClipRegion(const SkRegion& region, SkCanvas::ClipOp op) : region(region), op(op) {} + SkRegion region; + SkCanvas::ClipOp op; void draw(SkCanvas* c, const SkMatrix&) { c->clipRegion(region, op); } }; @@ -597,16 +597,16 @@ void SkLiteDL::setMatrix(const SkMatrix& matrix) { this->push<SetMatrix>(0, ma void SkLiteDL::translate(SkScalar dx, SkScalar dy) { this->push<Translate>(0, dx, dy); } void SkLiteDL::translateZ(SkScalar dz) { this->push<TranslateZ>(0, dz); } -void SkLiteDL::clipPath(const SkPath& path, SkRegion::Op op, bool aa) { +void SkLiteDL::clipPath(const SkPath& path, SkCanvas::ClipOp op, bool aa) { this->push<ClipPath>(0, path, op, aa); } -void SkLiteDL::clipRect(const SkRect& rect, SkRegion::Op op, bool aa) { +void SkLiteDL::clipRect(const SkRect& rect, SkCanvas::ClipOp op, bool aa) { this->push<ClipRect>(0, rect, op, aa); } -void SkLiteDL::clipRRect(const SkRRect& rrect, SkRegion::Op op, bool aa) { +void SkLiteDL::clipRRect(const SkRRect& rrect, SkCanvas::ClipOp op, bool aa) { this->push<ClipRRect>(0, rrect, op, aa); } -void SkLiteDL::clipRegion(const SkRegion& region, SkRegion::Op op) { +void SkLiteDL::clipRegion(const SkRegion& region, SkCanvas::ClipOp op) { this->push<ClipRegion>(0, region, op); } |