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

samplecode/SamplePictFile.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SampleCode.h"
 #include "SkDumpCanvas.h"
 #include "SkView.h"
@@ skipping 82 matching lines @@
     }
 
     virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
         SkASSERT(static_cast<int>(fBBox) < kBBoxTypeCount);
         SkPicture** picture = fPictures + fBBox;
 
         if (!*picture) {
             *picture = LoadPicture(fFilename.c_str(), fBBox);
         }
         if (*picture) {
-            canvas->drawPicture(**picture);
+            canvas->drawPicture(*picture);
         }
     }
 
 private:
     enum BBoxType {
         kNo_BBoxType,
         kQuadTree_BBoxType,
         kRTree_BBoxType,
         kTileGrid_BBoxType,
 
@@ skipping 19 matching lines @@
         } else {
             SkFILEStream stream(path);
             if (stream.isValid()) {
                 pic.reset(SkPicture::CreateFromStream(&stream));
             } else {
                 SkDebugf("coun't load picture at \"path\"\n", path);
             }
 
             if (false) {
                 SkSurface* surf = SkSurface::NewRasterPMColor(pic->width(), pic->height());
-                surf->getCanvas()->drawPicture(*pic);
+                surf->getCanvas()->drawPicture(pic);
                 surf->unref();
             }
             if (false) { // re-record
                 SkPictureRecorder recorder;
                 pic->draw(recorder.beginRecording(pic->width(), pic->height(), NULL, 0));
                 SkAutoTUnref<SkPicture> p2(recorder.endRecording());
 
                 SkString path2(path);
                 path2.append(".new.skp");
                 SkFILEWStream writer(path2.c_str());
@@ skipping 41 matching lines @@
 SampleView* CreateSamplePictFileView(const char filename[]) {
     return new PictFileView(filename);
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
 #if 0
 static SkView* MyFactory() { return new PictFileView; }
 static SkViewRegister reg(MyFactory);
 #endif