Revert of Add getReducedClipStack to lua canvas

src/utils/SkLua.cpp

 /*
  * 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 "SkLua.h"
-
-#include "GrReducedClip.h"
 #include "SkCanvas.h"
+#include "SkClipStack.h"
 #include "SkData.h"
 #include "SkDocument.h"
 #include "SkImage.h"
 #include "SkMatrix.h"
 #include "SkPaint.h"
 #include "SkPath.h"
 #include "SkPixelRef.h"
 #include "SkRRect.h"
 #include "SkString.h"
 #include "SkTypeface.h"
@@ skipping 245 matching lines @@
     }
     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())) {
-        this->pushClipStackElement(*element);
+        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);
 }
 
-void SkLua::pushClipStackElement(const SkClipStack::Element& element, const char* key) {
-    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");
-    CHECK_SETFIELD(key);
-}
-
-
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 
 static SkScalar lua2scalar(lua_State* L, int index) {
     SkASSERT(lua_isnumber(L, index));
     return SkLuaToScalar(lua_tonumber(L, index));
 }
 
 static SkScalar lua2scalar_def(lua_State* L, int index, SkScalar defaultValue) {
     if (lua_isnumber(L, index)) {
@@ skipping 128 matching lines @@
 static int lcanvas_getTotalMatrix(lua_State* L) {
     SkLua(L).pushMatrix(get_ref<SkCanvas>(L, 1)->getTotalMatrix());
     return 1;
 }
 
 static int lcanvas_getClipStack(lua_State* L) {
     SkLua(L).pushClipStack(*get_ref<SkCanvas>(L, 1)->getClipStack());
     return 1;
 }
 
-int SkLua::lcanvas_getReducedClipStack(lua_State* L) {
-    const SkCanvas* canvas = get_ref<SkCanvas>(L, 1);
-    SkISize layerSize = canvas->getTopLayerSize();
-    SkIPoint layerOrigin = canvas->getTopLayerOrigin();
-    SkIRect queryBounds = SkIRect::MakeXYWH(layerOrigin.fX, layerOrigin.fY,
-                                            layerSize.fWidth, layerSize.fHeight);
-
-    GrReducedClip::ElementList elements;
-    GrReducedClip::InitialState initialState;
-    int32_t genID;
-    SkIRect resultBounds;
-
-    const SkClipStack& stack = *canvas->getClipStack();
-
-    GrReducedClip::ReduceClipStack(stack,
-                                   queryBounds,
-                                   &elements,
-                                   &genID,
-                                   &initialState,
-                                   &resultBounds,
-                                   NULL);
-
-    GrReducedClip::ElementList::Iter iter(elements);
-    int i = 0;
-    lua_newtable(L);
-    while(NULL != iter.get()) {
-        SkLua(L).pushClipStackElement(*iter.get());
-        iter.next();
-        lua_rawseti(L, -2, ++i);
-    }
-    // Currently this only returns the element list to lua, not the initial state or result bounds.
-    // It could return these as additional items on the lua stack.
-    return 1;
-}
-
 static int lcanvas_save(lua_State* L) {
     lua_pushinteger(L, get_ref<SkCanvas>(L, 1)->save());
     return 1;
 }
 
 static int lcanvas_restore(lua_State* L) {
     get_ref<SkCanvas>(L, 1)->restore();
     return 0;
 }
 
@@ skipping 15 matching lines @@
     SkScalar degrees = lua2scalar_def(L, 2, 0);
     get_ref<SkCanvas>(L, 1)->rotate(degrees);
     return 0;
 }
 
 static int lcanvas_gc(lua_State* L) {
     get_ref<SkCanvas>(L, 1)->unref();
     return 0;
 }
 
-const struct luaL_Reg gSkCanvas_Methods[] = {
+static const struct luaL_Reg gSkCanvas_Methods[] = {
     { "drawColor", lcanvas_drawColor },
     { "drawRect", lcanvas_drawRect },
     { "drawOval", lcanvas_drawOval },
     { "drawCircle", lcanvas_drawCircle },
     { "drawImage", lcanvas_drawImage },
     { "drawPath", lcanvas_drawPath },
     { "drawText", lcanvas_drawText },
     { "getSaveCount", lcanvas_getSaveCount },
     { "getTotalMatrix", lcanvas_getTotalMatrix },
     { "getClipStack", lcanvas_getClipStack },
-    { "getReducedClipStack", SkLua::lcanvas_getReducedClipStack },
     { "save", lcanvas_save },
     { "restore", lcanvas_restore },
     { "scale", lcanvas_scale },
     { "translate", lcanvas_translate },
     { "rotate", lcanvas_rotate },
     { "__gc", lcanvas_gc },
     { NULL, NULL }
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ skipping 863 matching lines @@
     REG_CLASS(L, SkShader);
     REG_CLASS(L, SkTypeface);
     REG_CLASS(L, SkMatrix);
 }
 
 extern "C" int luaopen_skia(lua_State* L);
 extern "C" int luaopen_skia(lua_State* L) {
     SkLua::Load(L);
     return 0;
 }