shapes checkpoint: move matrix into groupshape and out of shape
git-svn-id: http://skia.googlecode.com/svn/trunk@178 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/include/core/SkShape.h b/include/core/SkShape.h
index 78a140e..8978afa 100644
--- a/include/core/SkShape.h
+++ b/include/core/SkShape.h
@@ -2,19 +2,14 @@
#define SkShape_DEFINED
#include "SkFlattenable.h"
-#include "SkMatrix.h"
class SkCanvas;
+class SkMatrix;
class SkWStream;
class SkShape : public SkFlattenable {
public:
- SkShape() : fMatrix(NULL) {}
- virtual ~SkShape();
-
- void getMatrix(SkMatrix*) const;
- void setMatrix(const SkMatrix&);
- void resetMatrix();
+ SkShape() {}
void draw(SkCanvas*);
@@ -34,11 +29,9 @@
protected:
virtual void onDraw(SkCanvas*) = 0;
- SkShape(SkFlattenableReadBuffer&);
+ SkShape(SkFlattenableReadBuffer&) {}
private:
- SkMatrix* fMatrix;
-
static SkFlattenable* CreateProc(SkFlattenableReadBuffer&);
typedef SkFlattenable INHERITED;