add shape flatten so they work properly in pictures

add flatten/unflatten to matrix



git-svn-id: http://skia.googlecode.com/svn/trunk@242 2bbb7eff-a529-9590-31e7-b0007b416f81

1 files changed, 8 insertions, 4 deletions

diff --git a/include/core/SkShape.h b/include/core/SkShape.h
index abe4e268af..6cee70e751 100644
--- a/include/core/SkShape.h
+++ b/include/core/SkShape.h
@@ -9,7 +9,8 @@ class SkWStream;
 
 class SkShape : public SkFlattenable {
 public:
-    SkShape() {}
+    SkShape();
+    virtual ~SkShape();
 
     void draw(SkCanvas*);
 
@@ -24,15 +25,18 @@ public:
     void drawMatrix(SkCanvas*, const SkMatrix&);
 
     // overrides
+    virtual Factory getFactory();
     virtual void flatten(SkFlattenableWriteBuffer&);
 
+    // public for Registrar
+    static SkFlattenable* CreateProc(SkFlattenableReadBuffer&);
+
 protected:
-    virtual void onDraw(SkCanvas*) = 0;
+    virtual void onDraw(SkCanvas*);
 
-    SkShape(SkFlattenableReadBuffer&) {}
+    SkShape(SkFlattenableReadBuffer&);
 
 private:
-    static SkFlattenable* CreateProc(SkFlattenableReadBuffer&);
 
     typedef SkFlattenable INHERITED;
 };