Remove legacy picture recording

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 114 matching lines @@
      */
     SkPicture* clone() const;
 
     /**
      * Creates multiple thread-safe clones of this picture that are ready for
      * playback. The resulting clones are stored in the provided array of
      * SkPictures.
      */
     void clone(SkPicture* pictures, int count) const;
 
+    // TODO: kUsePathBoundsForClip_RecordingFlag no longer belongs in
+    // SkPicture. It should be moved to SkPictureRecorder (or just made

[mtklein, 2014/06/03 15:27:44]

+1 to default.

+    // the default behavior).
     enum RecordingFlags {
         /*  This flag specifies that when clipPath() is called, the path will
             be faithfully recorded, but the recording canvas' current clip will
             only see the path's bounds. This speeds up the recording process
             without compromising the fidelity of the playback. The only side-
             effect for recording is that calling getTotalClip() or related
             clip-query calls will reflect the path's bounds, not the actual
             path.
          */
         kUsePathBoundsForClip_RecordingFlag = 0x01
     };
 
-#ifndef SK_SUPPORT_DEPRECATED_RECORD_FLAGS
-    // TODO: once kOptimizeForClippedPlayback_RecordingFlag is hidden from
-    // all external consumers, SkPicture::createBBoxHierarchy can also be
-    // cleaned up.
-private:
-#endif
-    enum Deprecated_RecordingFlags {
-        /*  This flag causes the picture to compute bounding boxes and build
-            up a spatial hierarchy (currently an R-Tree), plus a tree of Canvas'
-            usually stack-based clip/etc state. This requires an increase in
-            recording time (often ~2x; likely more for very complex pictures),
-            but allows us to perform much faster culling at playback time, and
-            completely avoid some unnecessary clips and other operations. This
-            is ideal for tiled rendering, or any other situation where you're
-            drawing a fraction of a large scene into a smaller viewport.
-
-            In most cases the record cost is offset by the playback improvement
-            after a frame or two of tiled rendering (and complex pictures that
-            induce the worst record times will generally get the largest
-            speedups at playback time).
-
-            Note: Currently this is not serializable, the bounding data will be
-            discarded if you serialize into a stream and then deserialize.
-        */
-        kOptimizeForClippedPlayback_RecordingFlag = 0x02,
-    };
-#ifndef SK_SUPPORT_DEPRECATED_RECORD_FLAGS
-public:
-#endif
-
-#ifndef SK_SUPPORT_LEGACY_PICTURE_CAN_RECORD
-private:
-#endif
-
-#ifdef SK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES
-
-    /** Returns the canvas that records the drawing commands.
-        @param width the base width for the picture, as if the recording
-                     canvas' bitmap had this width.
-        @param height the base width for the picture, as if the recording
-                     canvas' bitmap had this height.
-        @param recordFlags optional flags that control recording.
-        @return the picture canvas.
-    */
-    SkCanvas* beginRecording(int width, int height, uint32_t recordFlags = 0);
-#endif
-
-    /** Returns the recording canvas if one is active, or NULL if recording is
-        not active. This does not alter the refcnt on the canvas (if present).
-    */
-    SkCanvas* getRecordingCanvas() const;
-    /** Signal that the caller is done recording. This invalidates the canvas
-        returned by beginRecording/getRecordingCanvas, and prepares the picture
-        for drawing. Note: this happens implicitly the first time the picture
-        is drawn.
-    */
-    void endRecording();
-
-#ifndef SK_SUPPORT_LEGACY_PICTURE_CAN_RECORD
-public:
-#endif
-
     /** Replays the drawing commands on the specified canvas. This internally
         calls endRecording() if that has not already been called.
         @param canvas the canvas receiving the drawing commands.
     */
     void draw(SkCanvas* canvas, SkDrawPictureCallback* = NULL);
 
     /** Return the width of the picture's recording canvas. This
         value reflects what was passed to setSize(), and does not necessarily
         reflect the bounds of what has been recorded into the picture.
         @return the width of the picture's recording canvas
@@ skipping 127 matching lines @@
     SkPictureRecord*      fRecord;
     int                   fWidth, fHeight;
     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);
 
-#ifdef SK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES
-    // For testing. Derived classes may instantiate an alternate
-    // SkBBoxHierarchy implementation
-    virtual SkBBoxHierarchy* createBBoxHierarchy() const;
-#endif
-
-    SkCanvas* beginRecording(int width, int height, SkBBHFactory* factory, uint32_t recordFlags);
-
 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:
@@ skipping 105 matching lines @@
                                                bool deepCopy);
 
     friend class SkFlatPicture;
     friend class SkPicturePlayback;
     friend class SkPictureRecorder;
     friend class SkGpuDevice;
     friend class GrGatherCanvas;
     friend class GrGatherDevice;
     friend class SkDebugCanvas;
 
+    // TODO: beginRecording, getRecordingCanvas & endRecording can now be
+    // be moved out of SkPicture (and, presumably, be directly implemented
+    // in SkPictureRecorder)
+
+    /** Returns the canvas that records the drawing commands.
+        @param width the base width for the picture, as if the recording
+               canvas' bitmap had this width.
+        @param height the base width for the picture, as if the recording
+               canvas' bitmap had this height.
+        @param factory if non-NULL, the factory used to the BBH for the recorded picture
+        @param recordFlags optional flags that control recording.
+        @return the picture canvas.
+    */
+    SkCanvas* beginRecording(int width, int height, SkBBHFactory* factory, uint32_t recordFlags);
+    /** Returns the recording canvas if one is active, or NULL if recording is
+        not active. This does not alter the refcnt on the canvas (if present).
+    */
+    SkCanvas* getRecordingCanvas() const;
+    /** Signal that the caller is done recording. This invalidates the canvas
+        returned by beginRecording/getRecordingCanvas, and prepares the picture
+        for drawing. Note: this happens implicitly the first time the picture
+        is drawn.
+    */
+    void endRecording();
+
     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;
 };
 
-#ifdef SK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES
-
-class SkPictureFactory : public SkRefCnt {
-public:
-    /**
-     *  Allocate a new SkPicture. Return NULL on failure.
-     */
-    virtual SkPicture* create(int width, int height) = 0;
-
-private:
-    typedef SkRefCnt INHERITED;
-};
-
 #endif
-
-#ifdef SK_SUPPORT_LEGACY_PICTURE_HEADERS
-#include "SkPictureRecorder.h"
-#endif
-
-#endif