Remove SkPicture pointer from SkPicturePlayback

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
 #define SkPicture_DEFINED
 
 #include "SkBitmap.h"
 #include "SkImageDecoder.h"
 #include "SkRefCnt.h"
 
 #if SK_SUPPORT_GPU
 class GrContext;
 #endif
 
 class SkBBHFactory;
 class SkBBoxHierarchy;
 class SkCanvas;
 class SkDrawPictureCallback;
 class SkData;
-class SkPathHeap;
 class SkPicturePlayback;
 class SkPictureRecord;
 class SkStream;
 class SkWStream;
 
 struct SkPictInfo;
 
 /** \class SkPicture
 
     The SkPicture class records the drawing commands made to a canvas, to
@@ skipping 242 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);
+    SkPicture(int width, int height, const SkPictureRecord& record, bool deepCopyOps);
 
 private:
-    SkAutoTUnref<SkPathHeap> fPathHeap;  // reference counted
-
-    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;
-    void dumpSize() const;
-
     // An OperationList encapsulates a set of operation offsets into the picture byte
     // stream along with the CTMs needed for those operation.
     class OperationList : ::SkNoncopyable {
     public:
         virtual ~OperationList() {}
 
         // If valid returns false then there is no optimization data
         // present. All the draw operations need to be issued.
         virtual bool valid() const { return false; }
 
@@ skipping 45 matching lines @@
  */
 class SK_API SkDrawPictureCallback {
 public:
     SkDrawPictureCallback() {}
     virtual ~SkDrawPictureCallback() {}
 
     virtual bool abortDrawing() = 0;
 };
 
 #endif