Remove picture pre-allocation from SkPictureRecorder

include/core/SkPicture.h

 
 /*
  * Copyright 2007 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkPicture_DEFINED
@@ skipping 268 matching lines @@
     SkPicturePlayback*    fPlayback;
     int                   fWidth, fHeight;
     mutable const AccelData* fAccelData;
 
     void needsNewGenID() { fUniqueID = SK_InvalidGenID; }
 
     // Create a new SkPicture from an existing SkPicturePlayback. Ref count of
     // playback is unchanged.
     SkPicture(SkPicturePlayback*, int width, int height);
 
+    SkPicture(int width, int height, SkPictureRecord& record, bool deepCopyOps);

[mtklein, 2014/06/11 15:30:21]

is const SkPictureRecord& possible here?  possible if we move path heap to
picture playback too?

[robertphillips, 2014/06/11 17:06:49]

I want to move the path heap to SkPicturePlayback in a separate CL. After that
is complete then we could make this const.

+
 private:
-    friend class SkPictureRecord;
-    friend class SkPictureTester;   // for unit testing
-
     SkAutoTUnref<SkPathHeap> fPathHeap;  // reference counted
 
-    // ContentInfo is not serialized! It is intended solely for use
-    // with suitableForGpuRasterization.
-    class ContentInfo {
-    public:
-        ContentInfo() { this->reset(); }
-
-        ContentInfo(const ContentInfo& src) { this->set(src); }
-
-        void set(const ContentInfo& src) {
-            fNumPaintWithPathEffectUses = src.fNumPaintWithPathEffectUses;
-            fNumAAConcavePaths = src.fNumAAConcavePaths;
-            fNumAAHairlineConcavePaths = src.fNumAAHairlineConcavePaths;
-        }
-
-        void reset() {
-            fNumPaintWithPathEffectUses = 0;
-            fNumAAConcavePaths = 0;
-            fNumAAHairlineConcavePaths = 0;
-        }
-
-        void swap(ContentInfo* other) {
-            SkTSwap(fNumPaintWithPathEffectUses, other->fNumPaintWithPathEffectUses);
-            SkTSwap(fNumAAConcavePaths, other->fNumAAConcavePaths);
-            SkTSwap(fNumAAHairlineConcavePaths, other->fNumAAHairlineConcavePaths);
-        }
-
-        // This field is incremented every time a paint with a path effect is
-        // used (i.e., it is not a de-duplicated count)
-        int fNumPaintWithPathEffectUses;
-        // This field is incremented every time an anti-aliased drawPath call is
-        // issued with a concave path
-        int fNumAAConcavePaths;
-        // This field is incremented every time a drawPath call is
-        // issued for a hairline stroked concave path.
-        int fNumAAHairlineConcavePaths;
-    };
-
-    ContentInfo fContentInfo;
-
-    void incPaintWithPathEffectUses() {
-        ++fContentInfo.fNumPaintWithPathEffectUses;
-    }
-    int numPaintWithPathEffectUses() const {
-        return fContentInfo.fNumPaintWithPathEffectUses;
-    }
-
-    void incAAConcavePaths() {
-        ++fContentInfo.fNumAAConcavePaths;
-    }
-    int numAAConcavePaths() const {
-        return fContentInfo.fNumAAConcavePaths;
-    }
-
-    void incAAHairlineConcavePaths() {
-        ++fContentInfo.fNumAAHairlineConcavePaths;
-        SkASSERT(fContentInfo.fNumAAHairlineConcavePaths <= fContentInfo.fNumAAConcavePaths);
-    }
-    int numAAHairlineConcavePaths() const {
-        return fContentInfo.fNumAAHairlineConcavePaths;
-    }
-
     const SkPath& getPath(int index) const;
     int addPathToHeap(const SkPath& path);
 
     void flattenToBuffer(SkWriteBuffer& buffer) const;
     bool parseBufferTag(SkReadBuffer& buffer, uint32_t tag, uint32_t size);
 
     static void WriteTagSize(SkWriteBuffer& buffer, uint32_t tag, size_t size);
     static void WriteTagSize(SkWStream* stream, uint32_t tag, size_t size);
 
     void initForPlayback() const;
@@ skipping 26 matching lines @@
     const OperationList& EXPERIMENTAL_getActiveOps(const SkIRect& queryRect) const;
 
     /** PRIVATE / EXPERIMENTAL -- do not call
         Return the ID of the operation currently being executed when playing
         back. 0 indicates no call is active.
     */
     size_t EXPERIMENTAL_curOpID() const;
 
     void createHeader(SkPictInfo* info) const;
     static bool IsValidPictInfo(const SkPictInfo& info);
-    static SkPicturePlayback* FakeEndRecording(const SkPicture* resourceSrc,
-                                               const SkPictureRecord& record);
 
     friend class SkFlatPicture;
     friend class SkPicturePlayback;
-    friend class SkPictureRecorder;
+    friend class SkPictureRecorder; // just for SkPicture-based constructor
     friend class SkGpuDevice;
     friend class GrGatherCanvas;
     friend class GrGatherDevice;
     friend class SkDebugCanvas;
 
     typedef SkRefCnt INHERITED;
 };
 
 /**
  *  Subclasses of this can be passed to canvas.drawPicture. During the drawing
  *  of the picture, this callback will periodically be invoked. If its
  *  abortDrawing() returns true, then picture playback will be interrupted.
  *
  *  The resulting drawing is undefined, as there is no guarantee how often the
  *  callback will be invoked. If the abort happens inside some level of nested
  *  calls to save(), restore will automatically be called to return the state
  *  to the same level it was before the drawPicture call was made.
  */
 class SK_API SkDrawPictureCallback {
 public:
     SkDrawPictureCallback() {}
     virtual ~SkDrawPictureCallback() {}
 
     virtual bool abortDrawing() = 0;
 };
 
 #endif