diff -r 000000000000 -r 6474c204b198 gfx/skia/trunk/src/utils/SkLuaCanvas.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gfx/skia/trunk/src/utils/SkLuaCanvas.cpp	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,295 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkLuaCanvas.h"
+#include "SkLua.h"
+
+extern "C" {
+    #include "lua.h"
+    #include "lauxlib.h"
+}
+
+class AutoCallLua : public SkLua {
+public:
+    AutoCallLua(lua_State* L, const char func[], const char verb[]) : INHERITED(L) {
+        lua_getglobal(L, func);
+        if (!lua_isfunction(L, -1)) {
+            int t = lua_type(L, -1);
+            SkDebugf("--- expected function %d\n", t);
+        }
+
+        lua_newtable(L);
+        this->pushString(verb, "verb");
+    }
+
+    ~AutoCallLua() {
+        lua_State* L = this->get();
+        if (lua_pcall(L, 1, 0, 0) != LUA_OK) {
+            SkDebugf("lua err: %s\n", lua_tostring(L, -1));
+        }
+        lua_settop(L, -1);
+    }
+
+    void pushEncodedText(SkPaint::TextEncoding, const void*, size_t);
+
+private:
+    typedef SkLua INHERITED;
+};
+
+#define AUTO_LUA(verb)  AutoCallLua lua(fL, fFunc.c_str(), verb)
+
+
+///////////////////////////////////////////////////////////////////////////////
+
+void AutoCallLua::pushEncodedText(SkPaint::TextEncoding enc, const void* text,
+                                  size_t length) {
+    switch (enc) {
+        case SkPaint::kUTF8_TextEncoding:
+            this->pushString((const char*)text, length, "text");
+            break;
+        case SkPaint::kUTF16_TextEncoding: {
+            SkString str;
+            str.setUTF16((const uint16_t*)text, length);
+            this->pushString(str, "text");
+        } break;
+        case SkPaint::kGlyphID_TextEncoding:
+            this->pushArrayU16((const uint16_t*)text, SkToInt(length >> 1),
+                               "glyphs");
+            break;
+        case SkPaint::kUTF32_TextEncoding:
+            break;
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+void SkLuaCanvas::pushThis() {
+    SkLua(fL).pushCanvas(this);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+SkLuaCanvas::SkLuaCanvas(int width, int height, lua_State* L, const char func[])
+    : INHERITED(width, height)
+    , fL(L)
+    , fFunc(func) {
+}
+
+SkLuaCanvas::~SkLuaCanvas() {}
+
+void SkLuaCanvas::willSave(SaveFlags flags) {
+    AUTO_LUA("save");
+    this->INHERITED::willSave(flags);
+}
+
+SkCanvas::SaveLayerStrategy SkLuaCanvas::willSaveLayer(const SkRect* bounds, const SkPaint* paint,
+                                                       SaveFlags flags) {
+    AUTO_LUA("saveLayer");
+    if (bounds) {
+        lua.pushRect(*bounds, "bounds");
+    }
+    if (paint) {
+        lua.pushPaint(*paint, "paint");
+    }
+
+    this->INHERITED::willSaveLayer(bounds, paint, flags);
+    // No need for a layer.
+    return kNoLayer_SaveLayerStrategy;
+}
+
+void SkLuaCanvas::willRestore() {
+    AUTO_LUA("restore");
+    this->INHERITED::willRestore();
+}
+
+void SkLuaCanvas::didTranslate(SkScalar dx, SkScalar dy) {
+    AUTO_LUA("translate");
+    lua.pushScalar(dx, "dx");
+    lua.pushScalar(dy, "dy");
+    this->INHERITED::didTranslate(dx, dy);
+}
+
+void SkLuaCanvas::didScale(SkScalar sx, SkScalar sy) {
+    AUTO_LUA("scale");
+    lua.pushScalar(sx, "sx");
+    lua.pushScalar(sy, "sy");
+    this->INHERITED::didScale(sx, sy);
+}
+
+void SkLuaCanvas::didRotate(SkScalar degrees) {
+    AUTO_LUA("rotate");
+    lua.pushScalar(degrees, "degrees");
+    this->INHERITED::didRotate(degrees);
+}
+
+void SkLuaCanvas::didSkew(SkScalar kx, SkScalar ky) {
+    AUTO_LUA("skew");
+    lua.pushScalar(kx, "kx");
+    lua.pushScalar(ky, "ky");
+    this->INHERITED::didSkew(kx, ky);
+}
+
+void SkLuaCanvas::didConcat(const SkMatrix& matrix) {
+    AUTO_LUA("concat");
+    this->INHERITED::didConcat(matrix);
+}
+
+void SkLuaCanvas::didSetMatrix(const SkMatrix& matrix) {
+    this->INHERITED::didSetMatrix(matrix);
+}
+
+void SkLuaCanvas::onClipRect(const SkRect& r, SkRegion::Op op, ClipEdgeStyle edgeStyle) {
+    AUTO_LUA("clipRect");
+    lua.pushRect(r, "rect");
+    lua.pushBool(kSoft_ClipEdgeStyle == edgeStyle, "aa");
+    this->INHERITED::onClipRect(r, op, edgeStyle);
+}
+
+void SkLuaCanvas::onClipRRect(const SkRRect& rrect, SkRegion::Op op, ClipEdgeStyle edgeStyle) {
+    AUTO_LUA("clipRRect");
+    lua.pushRRect(rrect, "rrect");
+    lua.pushBool(kSoft_ClipEdgeStyle == edgeStyle, "aa");
+    this->INHERITED::onClipRRect(rrect, op, edgeStyle);
+}
+
+void SkLuaCanvas::onClipPath(const SkPath& path, SkRegion::Op op, ClipEdgeStyle edgeStyle) {
+    AUTO_LUA("clipPath");
+    lua.pushPath(path, "path");
+    lua.pushBool(kSoft_ClipEdgeStyle == edgeStyle, "aa");
+    this->INHERITED::onClipPath(path, op, edgeStyle);
+}
+
+void SkLuaCanvas::onClipRegion(const SkRegion& deviceRgn, SkRegion::Op op) {
+    AUTO_LUA("clipRegion");
+    this->INHERITED::onClipRegion(deviceRgn, op);
+}
+
+void SkLuaCanvas::drawPaint(const SkPaint& paint) {
+    AUTO_LUA("drawPaint");
+    lua.pushPaint(paint, "paint");
+}
+
+void SkLuaCanvas::drawPoints(PointMode mode, size_t count,
+                               const SkPoint pts[], const SkPaint& paint) {
+    AUTO_LUA("drawPoints");
+    lua.pushPaint(paint, "paint");
+}
+
+void SkLuaCanvas::drawOval(const SkRect& rect, const SkPaint& paint) {
+    AUTO_LUA("drawOval");
+    lua.pushRect(rect, "rect");
+    lua.pushPaint(paint, "paint");
+}
+
+void SkLuaCanvas::drawRect(const SkRect& rect, const SkPaint& paint) {
+    AUTO_LUA("drawRect");
+    lua.pushRect(rect, "rect");
+    lua.pushPaint(paint, "paint");
+}
+
+void SkLuaCanvas::drawRRect(const SkRRect& rrect, const SkPaint& paint) {
+    AUTO_LUA("drawRRect");
+    lua.pushRRect(rrect, "rrect");
+    lua.pushPaint(paint, "paint");
+}
+
+void SkLuaCanvas::onDrawDRRect(const SkRRect& outer, const SkRRect& inner,
+                               const SkPaint& paint) {
+    AUTO_LUA("drawDRRect");
+    lua.pushRRect(outer, "outer");
+    lua.pushRRect(inner, "inner");
+    lua.pushPaint(paint, "paint");
+}
+
+void SkLuaCanvas::drawPath(const SkPath& path, const SkPaint& paint) {
+    AUTO_LUA("drawPath");
+    lua.pushPath(path, "path");
+    lua.pushPaint(paint, "paint");
+}
+
+void SkLuaCanvas::drawBitmap(const SkBitmap& bitmap, SkScalar x, SkScalar y,
+                             const SkPaint* paint) {
+    AUTO_LUA("drawBitmap");
+    if (paint) {
+        lua.pushPaint(*paint, "paint");
+    }
+}
+
+void SkLuaCanvas::drawBitmapRectToRect(const SkBitmap& bitmap, const SkRect* src,
+                                       const SkRect& dst, const SkPaint* paint,
+                                       DrawBitmapRectFlags flags) {
+    AUTO_LUA("drawBitmapRectToRect");
+    if (paint) {
+        lua.pushPaint(*paint, "paint");
+    }
+}
+
+void SkLuaCanvas::drawBitmapMatrix(const SkBitmap& bitmap, const SkMatrix& m,
+                                   const SkPaint* paint) {
+    AUTO_LUA("drawBitmapMatrix");
+    if (paint) {
+        lua.pushPaint(*paint, "paint");
+    }
+}
+
+void SkLuaCanvas::drawSprite(const SkBitmap& bitmap, int x, int y,
+                               const SkPaint* paint) {
+    AUTO_LUA("drawSprite");
+    if (paint) {
+        lua.pushPaint(*paint, "paint");
+    }
+}
+
+void SkLuaCanvas::drawText(const void* text, size_t byteLength, SkScalar x,
+                             SkScalar y, const SkPaint& paint) {
+    AUTO_LUA("drawText");
+    lua.pushEncodedText(paint.getTextEncoding(), text, byteLength);
+    lua.pushPaint(paint, "paint");
+}
+
+void SkLuaCanvas::drawPosText(const void* text, size_t byteLength,
+                                const SkPoint pos[], const SkPaint& paint) {
+    AUTO_LUA("drawPosText");
+    lua.pushEncodedText(paint.getTextEncoding(), text, byteLength);
+    lua.pushPaint(paint, "paint");
+}
+
+void SkLuaCanvas::drawPosTextH(const void* text, size_t byteLength,
+                                 const SkScalar xpos[], SkScalar constY,
+                                 const SkPaint& paint) {
+    AUTO_LUA("drawPosTextH");
+    lua.pushEncodedText(paint.getTextEncoding(), text, byteLength);
+    lua.pushPaint(paint, "paint");
+}
+
+void SkLuaCanvas::drawTextOnPath(const void* text, size_t byteLength,
+                                   const SkPath& path, const SkMatrix* matrix,
+                                   const SkPaint& paint) {
+    AUTO_LUA("drawTextOnPath");
+    lua.pushPath(path, "path");
+    lua.pushEncodedText(paint.getTextEncoding(), text, byteLength);
+    lua.pushPaint(paint, "paint");
+}
+
+void SkLuaCanvas::drawPicture(SkPicture& picture) {
+    AUTO_LUA("drawPicture");
+    // call through so we can see the nested picture ops
+    this->INHERITED::drawPicture(picture);
+}
+
+void SkLuaCanvas::drawVertices(VertexMode vmode, int vertexCount,
+                                 const SkPoint vertices[], const SkPoint texs[],
+                                 const SkColor colors[], SkXfermode* xmode,
+                                 const uint16_t indices[], int indexCount,
+                                 const SkPaint& paint) {
+    AUTO_LUA("drawVertices");
+    lua.pushPaint(paint, "paint");
+}
+
+void SkLuaCanvas::drawData(const void* data, size_t length) {
+    AUTO_LUA("drawData");
+}