New drop of Skia. This is up to CL 121320.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6925 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 23 deletions

diff --git a/skia/picture/SkPictureFlat.h b/skia/picture/SkPictureFlat.h
index 64a7359..9e7fc5e 100644
--- a/skia/picture/SkPictureFlat.h
+++ b/skia/picture/SkPictureFlat.h
@@ -24,11 +24,12 @@ enum DrawType {
     DRAW_POINTS,
     DRAW_POS_TEXT,
     DRAW_POS_TEXT_H,
-    DRAW_RECT_GENERAL,
-    DRAW_RECT_SIMPLE,
+    DRAW_POS_TEXT_H_TOP_BOTTOM, // fast variant of DRAW_POS_TEXT_H
+    DRAW_RECT,
     DRAW_SPRITE,
     DRAW_TEXT,
     DRAW_TEXT_ON_PATH,
+    DRAW_TEXT_TOP_BOTTOM,   // fast variant of DRAW_TEXT
     DRAW_VERTICES,
     RESTORE,
     ROTATE,
@@ -48,7 +49,7 @@ enum DrawVertexFlags {
 class SkRefCntPlayback {
 public:
     SkRefCntPlayback();
-    virtual ~SkRefCntPlayback();
+    ~SkRefCntPlayback();
     
     int count() const { return fCount; }
     
@@ -183,26 +184,6 @@ private:
     typedef SkFlatData INHERITED;
 };
 
-class SkFlatPath : public SkFlatData {
-public:
-    static SkFlatPath* Flatten(SkChunkAlloc* heap, const SkPath& path, int index);
-    
-    void unflatten(SkPath* path) const {
-        SkFlattenableReadBuffer buffer(fPathData);
-        path->unflatten(buffer);
-    }
-    
-#ifdef SK_DEBUG_VALIDATE
-    void validate() const {
-        // to be written
-    }
-#endif
-
-private:
-    char fPathData[1];
-    typedef SkFlatData INHERITED;
-};
-
 class SkFlatRegion : public SkFlatData {
 public:
     static SkFlatRegion* Flatten(SkChunkAlloc* heap, const SkRegion& region, int index);