diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-28 15:28:02 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-28 15:28:02 +0000 |
| commit | 03fc3b4f67a115e4a7945d173856a6c80b09311e (patch) | |
| tree | 76665d4141136cb091f7c9e3e5d3bdc2342cdfa2 /src/utils/SkLuaCanvas.cpp | |
| parent | d85f32ca40475fb246dd8ca93abaf1c3db0389e1 (diff) | |
Revert of r13620 (add new onClip* methods to SkCanvas - https://codereview.chromium.org/183453002/) due to broken Chrome Canary and failing tests.
git-svn-id: http://skia.googlecode.com/svn/trunk@13622 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/utils/SkLuaCanvas.cpp')
| -rw-r--r-- | src/utils/SkLuaCanvas.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/utils/SkLuaCanvas.cpp b/src/utils/SkLuaCanvas.cpp index 0f13073049..8c25dc0401 100644 --- a/src/utils/SkLuaCanvas.cpp +++ b/src/utils/SkLuaCanvas.cpp @@ -139,30 +139,30 @@ void SkLuaCanvas::setMatrix(const SkMatrix& matrix) { this->INHERITED::setMatrix(matrix); } -void SkLuaCanvas::onClipRect(const SkRect& r, SkRegion::Op op, ClipEdgeStyle edgeStyle) { +bool SkLuaCanvas::clipRect(const SkRect& r, SkRegion::Op op, bool doAA) { AUTO_LUA("clipRect"); lua.pushRect(r, "rect"); - lua.pushBool(kSoft_ClipEdgeStyle == edgeStyle, "aa"); - this->INHERITED::onClipRect(r, op, edgeStyle); + lua.pushBool(doAA, "aa"); + return this->INHERITED::clipRect(r, op, doAA); } -void SkLuaCanvas::onClipRRect(const SkRRect& rrect, SkRegion::Op op, ClipEdgeStyle edgeStyle) { +bool SkLuaCanvas::clipRRect(const SkRRect& rrect, SkRegion::Op op, bool doAA) { AUTO_LUA("clipRRect"); lua.pushRRect(rrect, "rrect"); - lua.pushBool(kSoft_ClipEdgeStyle == edgeStyle, "aa"); - this->INHERITED::onClipRRect(rrect, op, edgeStyle); + lua.pushBool(doAA, "aa"); + return this->INHERITED::clipRRect(rrect, op, doAA); } -void SkLuaCanvas::onClipPath(const SkPath& path, SkRegion::Op op, ClipEdgeStyle edgeStyle) { +bool SkLuaCanvas::clipPath(const SkPath& path, SkRegion::Op op, bool doAA) { AUTO_LUA("clipPath"); lua.pushPath(path, "path"); - lua.pushBool(kSoft_ClipEdgeStyle == edgeStyle, "aa"); - this->INHERITED::onClipPath(path, op, edgeStyle); + lua.pushBool(doAA, "aa"); + return this->INHERITED::clipPath(path, op, doAA); } -void SkLuaCanvas::onClipRegion(const SkRegion& deviceRgn, SkRegion::Op op) { +bool SkLuaCanvas::clipRegion(const SkRegion& deviceRgn, SkRegion::Op op) { AUTO_LUA("clipRegion"); - this->INHERITED::onClipRegion(deviceRgn, op); + return this->INHERITED::clipRegion(deviceRgn, op); } void SkLuaCanvas::drawPaint(const SkPaint& paint) { |