Split SkPicturePlayback out of SkPictureData

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 163 matching lines @@
      */
     void flatten(SkWriteBuffer&) const;
 
     /**
      * Returns true if any bitmaps may be produced when this SkPicture
      * is replayed.
      * Returns false if called while still recording.
      */
     bool willPlayBackBitmaps() const;
 
-#ifdef SK_BUILD_FOR_ANDROID
-    /** Signals that the caller is prematurely done replaying the drawing
-        commands. This can be called from a canvas virtual while the picture
-        is drawing. Has no effect if the picture is not drawing.
-        @deprecated preserving for legacy purposes
-    */
-    void abortPlayback();
-#endif
-
     /** Return true if the SkStream/Buffer represents a serialized picture, and
         fills out SkPictInfo. After this function returns, the data source is not
         rewound so it will have to be manually reset before passing to
         CreateFromStream or CreateFromBuffer. Note, CreateFromStream and
         CreateFromBuffer perform this check internally so these entry points are
         intended for stand alone tools.
         If false is returned, SkPictInfo is unmodified.
     */
     static bool InternalOnly_StreamIsSKP(SkStream*, SkPictInfo*);
     static bool InternalOnly_BufferIsSKP(SkReadBuffer&, SkPictInfo*);
@@ skipping 62 matching lines @@
 private:
     static void WriteTagSize(SkWriteBuffer& buffer, uint32_t tag, size_t size);
     static void WriteTagSize(SkWStream* stream, uint32_t tag, size_t size);
 
     // 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; }
-
         // The following three entry points should only be accessed if
         // 'valid' returns true.
         virtual int numOps() const { SkASSERT(false); return 0; };
         // The offset in the picture of the operation to execute.
         virtual uint32_t offset(int index) const { SkASSERT(false); return 0; };
         // The CTM that must be installed for the operation to behave correctly
         virtual const SkMatrix& matrix(int index) const { SkASSERT(false); return SkMatrix::I(); }
-
-        static const OperationList& InvalidList();
     };
 
     /** PRIVATE / EXPERIMENTAL -- do not call
         Return the operations required to render the content inside 'queryRect'.
     */
-    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;
+    const OperationList* EXPERIMENTAL_getActiveOps(const SkIRect& queryRect) const;
 
     void createHeader(SkPictInfo* info) const;
     static bool IsValidPictInfo(const SkPictInfo& info);
 
     friend class SkFlatPicture;
     friend class SkPictureData;
     friend class SkPictureRecorder; // just for SkPicture-based constructor
     friend class SkGpuDevice;
     friend class GrGatherCanvas;
     friend class GrGatherDevice;
     friend class SkDebugCanvas;
+    friend class SkPicturePlayback; // to get fData
 
     typedef SkRefCnt INHERITED;
 
     SkPicture(int width, int height, SkRecord*);  // Takes ownership.
     SkAutoTDelete<SkRecord> fRecord;
     bool fRecordWillPlayBackBitmaps; // TODO: const
 };
 
 #endif