Revert of Add getReducedClipStack to lua canvas (https://codereview.chromium.org/180283004/)
Reason for revert:
breaking a bunch of builds
Original issue's description:
> Add getReducedClipStack to lua canvas
>
> Committed: http://code.google.com/p/skia/source/detail?r=13594
R=reed@google.com
TBR=reed@google.com
NOTREECHECKS=true
NOTRY=true
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/181653004
git-svn-id: http://skia.googlecode.com/svn/trunk@13597 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h
index e9d4933..e639212 100644
--- a/include/core/SkCanvas.h
+++ b/include/core/SkCanvas.h
@@ -90,16 +90,12 @@
void flush();
/**
- * Gets the size of the base or root layer in global canvas coordinates. The
- * origin of the base layer is always (0,0). The current drawable area may be
- * smaller (due to clipping or saveLayer).
+ * DEPRECATED: call imageInfo() instead.
+ * Return the width/height of the underlying device. The current drawable
+ * area may be small (due to clipping or saveLayer). For a canvas with
+ * no device, 0,0 will be returned.
*/
- SkISize getBaseLayerSize() const;
-
- /**
- * DEPRECATED: call getBaseLayerSize
- */
- SkISize getDeviceSize() const { return this->getBaseLayerSize(); }
+ SkISize getDeviceSize() const;
/**
* DEPRECATED.
@@ -1133,7 +1129,6 @@
friend class SkDrawIter; // needs setupDrawForLayerDevice()
friend class AutoDrawLooper;
- friend class SkLua; // needs top layer size and offset
SkBaseDevice* createLayerDevice(const SkImageInfo&);
@@ -1148,12 +1143,6 @@
*/
SkBaseDevice* setRootDevice(SkBaseDevice* device);
- /**
- * Gets the size/origin of the top level layer in global canvas coordinates. We don't want this
- * to be public because it exposes decisions about layer sizes that are internal to the canvas.
- */
- SkISize getTopLayerSize() const;
- SkIPoint getTopLayerOrigin() const;
// internal methods are not virtual, so they can safely be called by other
// canvas apis, without confusing subclasses (like SkPictureRecording)
diff --git a/include/utils/SkLua.h b/include/utils/SkLua.h
index 2f29343..f67502a 100644
--- a/include/utils/SkLua.h
+++ b/include/utils/SkLua.h
@@ -8,7 +8,6 @@
#ifndef SkLua_DEFINED
#define SkLua_DEFINED
-#include "SkClipStack.h"
#include "SkColor.h"
#include "SkScalar.h"
#include "SkString.h"
@@ -16,6 +15,7 @@
struct lua_State;
class SkCanvas;
+class SkClipStack;
class SkMatrix;
class SkPaint;
class SkPath;
@@ -55,10 +55,6 @@
void pushPath(const SkPath&, const char tableKey[] = NULL);
void pushCanvas(SkCanvas*, const char tableKey[] = NULL);
void pushClipStack(const SkClipStack&, const char tableKey[] = NULL);
- void pushClipStackElement(const SkClipStack::Element& element, const char tableKey[] = NULL);
-
- // This SkCanvas lua methods is declared here to benefit from SkLua's friendship with SkCanvas.
- static int lcanvas_getReducedClipStack(lua_State* L);
private:
lua_State* fL;