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

src/core/SkPicturePlayback.h

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkPicturePlayback_DEFINED
 #define SkPicturePlayback_DEFINED
@@ skipping 132 matching lines @@
     }
 
     void getMatrix(SkReader32& reader, SkMatrix* matrix) {
         reader.readMatrix(matrix);
     }
 
     const SkPath& getPath(SkReader32& reader) {
         return fPicture->getPath(reader.readInt() - 1);
     }
 
-    SkPicture& getPicture(SkReader32& reader) {
+    const SkPicture* getPicture(SkReader32& reader) {
         int index = reader.readInt();
         SkASSERT(index > 0 && index <= fPictureCount);
-        return *fPictureRefs[index - 1];
+        return fPictureRefs[index - 1];
     }
 
     const SkPaint* getPaint(SkReader32& reader) {
         int index = reader.readInt();
         if (index == 0) {
             return NULL;
         }
         return &(*fPaints)[index - 1];
     }
 
@@ skipping 72 matching lines @@
     // bitmap allows playback to draw nothing and move on.
     SkBitmap fBadBitmap;
 
     SkAutoTUnref<SkBitmapHeap> fBitmapHeap;
 
     SkTRefArray<SkBitmap>* fBitmaps;
     SkTRefArray<SkPaint>* fPaints;
 
     SkData* fOpData;    // opcodes and parameters
 
-    SkPicture** fPictureRefs;
+    const SkPicture** fPictureRefs;
     int fPictureCount;
 
     SkBBoxHierarchy* fBoundingHierarchy;
     SkPictureStateTree* fStateTree;
 
     // Limit the opcode playback to be between the offsets 'start' and 'stop'.
     // The opcode at 'start' should be a saveLayer while the opcode at
     // 'stop' should be a restore. Neither of those commands will be issued.
     // Set both start & stop to 0 to disable draw limiting
     // Draw limiting cannot be enabled at the same time as draw replacing
@@ skipping 87 matching lines @@
     static void WriteFactories(SkWStream* stream, const SkFactorySet& rec);
     static void WriteTypefaces(SkWStream* stream, const SkRefCntSet& rec);
 
 #ifdef SK_BUILD_FOR_ANDROID
     SkMutex fDrawMutex;
     bool fAbortCurrentPlayback;
 #endif
 };
 
 #endif