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

samplecode/SampleApp.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 "SampleApp.h"
 
 #include "SkData.h"
@@ skipping 1452 matching lines @@
                                        SkImageEncoder::kPNG_Type, 100);
         }
     }
 
     if (kPicture_DeviceType == fDeviceType) {
         SkAutoTUnref<SkPicture> picture(fRecorder.endRecording());
 
         if (true) {
             SkPicture* pict = new SkPicture(*picture);
             this->installDrawFilter(orig);
-            orig->drawPicture(*pict);
+            orig->drawPicture(pict);
             pict->unref();
         } else if (true) {
             SkDynamicMemoryWStream ostream;
             picture->serialize(&ostream);
 
             SkAutoDataUnref data(ostream.copyToData());
             SkMemoryStream istream(data->data(), data->size());
             SkAutoTUnref<SkPicture> pict(SkPicture::CreateFromStream(&istream));
             if (pict.get() != NULL) {
-                orig->drawPicture(*pict.get());
+                orig->drawPicture(pict.get());
             }
         } else {
             picture->draw(orig);
         }
     }
 
     // Do this after presentGL and other finishing, rather than in afterChild
     if (fMeasureFPS && fMeasureFPS_StartTime) {
         fMeasureFPS_Time += SkTime::GetMSecs() - fMeasureFPS_StartTime;
     }
@@ skipping 1032 matching lines @@
     SkGraphics::Init();
     SkEvent::Init();
 }
 
 // FIXME: this should be in a header
 void application_term();
 void application_term() {
     SkEvent::Term();
     SkGraphics::Term();
 }