diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-11 23:47:35 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-11 23:47:35 +0000 |
| commit | 4fcd92d0bf09dc9c28643e83b95b6cbf9f1ff2b2 (patch) | |
| tree | 322b798b8c00af454caa4508320eaac1fad0a96e /src/utils/SkLuaCanvas.cpp | |
| parent | ab373bd459b91ccf5c7a286eb4a13f4a79b0f60d (diff) | |
Revert of Revert "De-virtualize SkCanvas save/restore." (https://codereview.chromium.org/194923008/)
Reason for revert:
Re-landing after roll fix.
Original issue's description:
> Revert "De-virtualize SkCanvas save/restore."
>
> (To allow a roll fix into the tree).
>
> This reverts commit edf702204be42c945254191f9f9cd6585b3d189b.
>
> R=halcanary@google.com
>
> Committed: https://code.google.com/p/skia/source/detail?r=13748
R=halcanary@google.com, fmalita@chromium.org
TBR=fmalita@chromium.org, halcanary@google.com
NOTREECHECKS=true
NOTRY=true
Author: fmalita@google.com
Review URL: https://codereview.chromium.org/196323003
git-svn-id: http://skia.googlecode.com/svn/trunk@13754 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/utils/SkLuaCanvas.cpp')
| -rw-r--r-- | src/utils/SkLuaCanvas.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/utils/SkLuaCanvas.cpp b/src/utils/SkLuaCanvas.cpp index 0f13073049..2679fd25bd 100644 --- a/src/utils/SkLuaCanvas.cpp +++ b/src/utils/SkLuaCanvas.cpp @@ -81,13 +81,13 @@ SkLuaCanvas::SkLuaCanvas(int width, int height, lua_State* L, const char func[]) SkLuaCanvas::~SkLuaCanvas() {} -int SkLuaCanvas::save(SaveFlags flags) { +void SkLuaCanvas::onSave(SaveFlags flags) { AUTO_LUA("save"); - return this->INHERITED::save(flags); + this->INHERITED::onSave(flags); } -int SkLuaCanvas::saveLayer(const SkRect* bounds, const SkPaint* paint, - SaveFlags flags) { +bool SkLuaCanvas::onSaveLayer(const SkRect* bounds, const SkPaint* paint, + SaveFlags flags) { AUTO_LUA("saveLayer"); if (bounds) { lua.pushRect(*bounds, "bounds"); @@ -95,12 +95,15 @@ int SkLuaCanvas::saveLayer(const SkRect* bounds, const SkPaint* paint, if (paint) { lua.pushPaint(*paint, "paint"); } - return this->INHERITED::save(flags); + + this->INHERITED::onSaveLayer(bounds, paint, flags); + // No need for a layer. + return false; } -void SkLuaCanvas::restore() { +void SkLuaCanvas::onRestore() { AUTO_LUA("restore"); - this->INHERITED::restore(); + this->INHERITED::onRestore(); } bool SkLuaCanvas::translate(SkScalar dx, SkScalar dy) { |