aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-02-24 18:59:48 +0000
committerGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-02-24 18:59:48 +0000
commit5cc25359c62c83c356c3a30572a05ac9647daa55 (patch)
treef99d036c57170796a58cc288c662cc596968db4b
parentd5f032d46baa42f836d06d7372fba8f022a20dfa (diff)
Add getClipStack method to lua SkCanvas
R=reed@google.com Author: bsalomon@google.com Review URL: https://codereview.chromium.org/177933003 git-svn-id: http://skia.googlecode.com/svn/trunk@13567 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r--include/utils/SkLua.h2
-rw-r--r--src/utils/SkLua.cpp68
-rw-r--r--tools/lua/dump_clipstack_at_restore.lua25
3 files changed, 95 insertions, 0 deletions
diff --git a/include/utils/SkLua.h b/include/utils/SkLua.h
index c6097464ef..f67502a2e8 100644
--- a/include/utils/SkLua.h
+++ b/include/utils/SkLua.h
@@ -15,6 +15,7 @@
struct lua_State;
class SkCanvas;
+class SkClipStack;
class SkMatrix;
class SkPaint;
class SkPath;
@@ -53,6 +54,7 @@ public:
void pushPaint(const SkPaint&, const char tableKey[] = NULL);
void pushPath(const SkPath&, const char tableKey[] = NULL);
void pushCanvas(SkCanvas*, const char tableKey[] = NULL);
+ void pushClipStack(const SkClipStack&, const char tableKey[] = NULL);
private:
lua_State* fL;
diff --git a/src/utils/SkLua.cpp b/src/utils/SkLua.cpp
index 9bbdc6c6ad..d6ce0239e1 100644
--- a/src/utils/SkLua.cpp
+++ b/src/utils/SkLua.cpp
@@ -7,6 +7,7 @@
#include "SkLua.h"
#include "SkCanvas.h"
+#include "SkClipStack.h"
#include "SkData.h"
#include "SkDocument.h"
#include "SkImage.h"
@@ -234,6 +235,67 @@ void SkLua::pushCanvas(SkCanvas* canvas, const char key[]) {
CHECK_SETFIELD(key);
}
+static const char* element_type(SkClipStack::Element::Type type) {
+ switch (type) {
+ case SkClipStack::Element::kEmpty_Type:
+ return "empty";
+ case SkClipStack::Element::kRect_Type:
+ return "rect";
+ case SkClipStack::Element::kRRect_Type:
+ return "rrect";
+ case SkClipStack::Element::kPath_Type:
+ return "path";
+ }
+ return "unknown";
+}
+
+static const char* region_op(SkRegion::Op op) {
+ switch (op) {
+ case SkRegion::kDifference_Op:
+ return "difference";
+ case SkRegion::kIntersect_Op:
+ return "intersect";
+ case SkRegion::kUnion_Op:
+ return "union";
+ case SkRegion::kXOR_Op:
+ return "xor";
+ case SkRegion::kReverseDifference_Op:
+ return "reverse-difference";
+ case SkRegion::kReplace_Op:
+ return "replace";
+ }
+ return "unknown";
+}
+
+void SkLua::pushClipStack(const SkClipStack& stack, const char* key) {
+ lua_newtable(fL);
+ SkClipStack::B2TIter iter(stack);
+ const SkClipStack::Element* element;
+ int i = 0;
+ while (NULL != (element = iter.next())) {
+ lua_newtable(fL);
+ SkClipStack::Element::Type type = element->getType();
+ this->pushString(element_type(type), "type");
+ switch (type) {
+ case SkClipStack::Element::kEmpty_Type:
+ break;
+ case SkClipStack::Element::kRect_Type:
+ this->pushRect(element->getRect(), "rect");
+ break;
+ case SkClipStack::Element::kRRect_Type:
+ this->pushRRect(element->getRRect(), "rrect");
+ break;
+ case SkClipStack::Element::kPath_Type:
+ this->pushPath(element->getPath(), "path");
+ break;
+ }
+ this->pushString(region_op(element->getOp()), "op");
+ this->pushBool(element->isAA(), "aa");
+ lua_rawseti(fL, -2, ++i);
+ }
+ CHECK_SETFIELD(key);
+}
+
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
@@ -377,6 +439,11 @@ static int lcanvas_getTotalMatrix(lua_State* L) {
return 1;
}
+static int lcanvas_getClipStack(lua_State* L) {
+ SkLua(L).pushClipStack(*get_ref<SkCanvas>(L, 1)->getClipStack());
+ return 1;
+}
+
static int lcanvas_save(lua_State* L) {
lua_pushinteger(L, get_ref<SkCanvas>(L, 1)->save());
return 1;
@@ -422,6 +489,7 @@ static const struct luaL_Reg gSkCanvas_Methods[] = {
{ "drawText", lcanvas_drawText },
{ "getSaveCount", lcanvas_getSaveCount },
{ "getTotalMatrix", lcanvas_getTotalMatrix },
+ { "getClipStack", lcanvas_getClipStack },
{ "save", lcanvas_save },
{ "restore", lcanvas_restore },
{ "scale", lcanvas_scale },
diff --git a/tools/lua/dump_clipstack_at_restore.lua b/tools/lua/dump_clipstack_at_restore.lua
new file mode 100644
index 0000000000..d53f5a3712
--- /dev/null
+++ b/tools/lua/dump_clipstack_at_restore.lua
@@ -0,0 +1,25 @@
+function sk_scrape_startcanvas(c, fileName)
+ canvas = c
+ clipstack = {}
+ restoreCount = 0
+end
+
+function sk_scrape_endcanvas(c, fileName)
+ canvas = nil
+end
+
+function sk_scrape_accumulate(t)
+ if (t.verb == "restore") then
+ restoreCount = restoreCount + 1;
+ io.write("Clip Stack at restore #", restoreCount, ":\n")
+ for i = 1, #clipstack do
+ local element = clipstack[i];
+ io.write("\t", element["op"], ", ", element["type"], ", aa:", tostring(element["aa"]), "\n")
+ end
+ io.write("\n")
+ else
+ clipstack = canvas:getClipStack()
+ end
+end
+
+function sk_scrape_summarize() end