Update SkPictureRecord to allow some ops to be written separately

src/core/SkPictureRecord.h

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #ifndef SkPictureRecord_DEFINED
 #define SkPictureRecord_DEFINED
 
@@ skipping 90 matching lines @@
 
     const SkWriter32& writeStream() const {
         return fWriter;
     }
 
     void beginRecording();
     void endRecording();
 
 private:
     void handleOptimization(int opt);
-    void recordRestoreOffsetPlaceholder(SkRegion::Op);
-    void fillRestoreOffsetPlaceholdersForCurrentStackLevel(
-        uint32_t restoreOffset);
+    int recordRestoreOffsetPlaceholder(SkRegion::Op);

[reed1, 2014/02/04 15:47:17]

not new, but soon we should start adding dox to these internal methods, since
this stuff is already hard to understand...

[robertphillips, 2014/02/04 19:08:01]

I will keep this in mind. If the collapsing code sticks the entire offset
recording system will change.

+    void fillRestoreOffsetPlaceholdersForCurrentStackLevel(uint32_t restoreOffset);
 
     SkTDArray<int32_t> fRestoreOffsetStack;
     int fFirstSavedLayerIndex;
     enum {
         kNoSavedLayerIndex = -1
     };
 
     /*
      * Write the 'drawType' operation and chunk size to the skp. 'size'
      * can potentially be increased if the chunk size needs its own storage
@@ skipping 34 matching lines @@
     }
     void addScalar(SkScalar scalar) {
         fWriter.writeScalar(scalar);
     }
 
     void addBitmap(const SkBitmap& bitmap);
     void addMatrix(const SkMatrix& matrix);
     const SkFlatData* addPaint(const SkPaint& paint) { return this->addPaintPtr(&paint); }
     const SkFlatData* addPaintPtr(const SkPaint* paint);
     void addFlatPaint(const SkFlatData* flatPaint);
+    int addPathToHeap(const SkPath& path);
     void addPath(const SkPath& path);
     void addPicture(SkPicture& picture);
     void addPoint(const SkPoint& point);
     void addPoints(const SkPoint pts[], int count);
     void addRect(const SkRect& rect);
     void addRectPtr(const SkRect* rect);
     void addIRect(const SkIRect& rect);
     void addIRectPtr(const SkIRect* rect);
     void addRRect(const SkRRect&);
     void addRegion(const SkRegion& region);
@@ skipping 52 matching lines @@
     // Will return a cached version when possible.
     const SkFlatData* getFlatPaintData(const SkPaint& paint);
     /**
      * SkBBoxRecord::drawPosTextH gets a flat paint and uses it,
      * then it calls this, using the extra parameter, to avoid duplication.
      */
     void drawPosTextHImpl(const void* text, size_t byteLength,
                           const SkScalar xpos[], SkScalar constY,
                           const SkPaint& paint, const SkFlatData* flatPaintData);
 
+    void concatImpl(const SkMatrix& matrix);

[reed1, 2014/02/04 15:47:17]

block comment as to why we have these "helpers"?

[robertphillips, 2014/02/04 19:08:01]

Done.

+    int clipRectImpl(const SkRect& rect, SkRegion::Op op, bool doAA);
+    int clipRRectImpl(const SkRRect& rrect, SkRegion::Op op, bool doAA);
+    int clipPathImpl(int pathID, SkRegion::Op op, bool doAA);
+    int clipRegionImpl(const SkRegion& region, SkRegion::Op op);
+    void saveImpl(SaveFlags flags);
+    void saveLayerImpl(const SkRect* bounds, const SkPaint* paint,
+                       SaveFlags flags);
+    void restoreImpl();
+
     // These are set to NULL in our constructor, but may be changed by
     // subclasses, in which case they will be SkSafeUnref'd in our destructor.
     SkBBoxHierarchy* fBoundingHierarchy;
     SkPictureStateTree* fStateTree;
 
     // Allocated in the constructor and managed by this class.
     SkBitmapHeap* fBitmapHeap;
 
 private:
     SkChunkFlatController fFlattenableHeap;
 
     SkPaintDictionary fPaints;
 
     SkPathHeap* fPathHeap;  // reference counted
     SkWriter32 fWriter;
 
     // we ref each item in these arrays
     SkTDArray<SkPicture*> fPictureRefs;
 
     uint32_t fRecordFlags;
     int fInitialSaveCount;
 
     friend class SkPicturePlayback;
     friend class SkPictureTester; // for unit testing
 
     typedef SkCanvas INHERITED;
 };
 
 #endif