Alter SkCanvas::drawPicture (devirtualize, take const SkPicture, take pointer)

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 50 matching lines @@
         typedef SkRefCnt INHERITED;
     };
 
     SkPicture();
     /** Make a copy of the contents of src. If src records more drawing after
         this call, those elements will not appear in this picture.
     */
     SkPicture(const SkPicture& src);
 
     /**  PRIVATE / EXPERIMENTAL -- do not call */
-    void EXPERIMENTAL_addAccelData(const AccelData* data) {
+    void EXPERIMENTAL_addAccelData(const AccelData* data) const {
         SkRefCnt_SafeAssign(fAccelData, data);
     }
     /**  PRIVATE / EXPERIMENTAL -- do not call */
     const AccelData* EXPERIMENTAL_getAccelData(AccelData::Key key) const {
         if (NULL != fAccelData && fAccelData->getKey() == key) {
             return fAccelData;
         }
         return NULL;
     }
 
@@ skipping 62 matching lines @@
             clip-query calls will reflect the path's bounds, not the actual
             path.
          */
         kUsePathBoundsForClip_RecordingFlag = 0x01
     };
 
     /** 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);
+    void draw(SkCanvas* canvas, SkDrawPictureCallback* = NULL) const;
 
     /** 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
     */
     int width() const { return fWidth; }
 
     /** Return the height of the picture's recording canvas. This
         value reflects what was passed to setSize(), and does not necessarily
@@ skipping 114 matching lines @@
     static const uint32_t CURRENT_PICTURE_VERSION = 28;
 
     mutable uint32_t      fUniqueID;
 
     // fPlayback, fRecord, fWidth & fHeight are protected to allow derived classes to
     // install their own SkPicturePlayback-derived players,SkPictureRecord-derived
     // recorders and set the picture size
     SkPicturePlayback*    fPlayback;
     SkPictureRecord*      fRecord;
     int                   fWidth, fHeight;
-    const AccelData*      fAccelData;
+    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);
 
 private:
     friend class SkPictureRecord;
     friend class SkPictureTester;   // for unit testing
@@ skipping 90 matching lines @@
         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 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,
@@ skipping 48 matching lines @@
  */
 class SK_API SkDrawPictureCallback {
 public:
     SkDrawPictureCallback() {}
     virtual ~SkDrawPictureCallback() {}
 
     virtual bool abortDrawing() = 0;
 };
 
 #endif