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

samplecode/SamplePicture.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 "SkData.h"
 #include "SkDecodingImageGenerator.h"
@@ skipping 56 matching lines @@
         recorder.beginRecording(100, 100, NULL, 0);
         fSubPicture = recorder.endRecording();
 
         SkCanvas* canvas = recorder.beginRecording(100, 100, NULL, 0);
         SkPaint paint;
         paint.setAntiAlias(true);
 
         canvas->drawBitmap(fBitmap, 0, 0, NULL);
 
         drawCircle(canvas, 50, SK_ColorBLACK);
-        canvas->drawPicture(*fSubPicture);
+        canvas->drawPicture(fSubPicture);
         canvas->translate(SkIntToScalar(50), 0);
-        canvas->drawPicture(*fSubPicture);
+        canvas->drawPicture(fSubPicture);
         canvas->translate(0, SkIntToScalar(50));
-        canvas->drawPicture(*fSubPicture);
+        canvas->drawPicture(fSubPicture);
         canvas->translate(SkIntToScalar(-50), 0);
-        canvas->drawPicture(*fSubPicture);
+        canvas->drawPicture(fSubPicture);
 
         fPicture = recorder.endRecording();
 
         // fPicture now has (4) references to fSubPicture. We can release our ref,
         // and just unref fPicture in our destructor, and it will in turn take care of
         // the other references to fSubPicture
         fSubPicture->unref();
     }
 
     virtual ~PictureView() {
@@ skipping 39 matching lines @@
         this->drawSomething(canvas);
 
         SkPictureRecorder recorder;
         this->drawSomething(recorder.beginRecording(100, 100, NULL, 0));
         SkAutoTUnref<SkPicture> pict(recorder.endRecording());
 
         canvas->save();
         canvas->translate(SkIntToScalar(300), SkIntToScalar(50));
         canvas->scale(-SK_Scalar1, -SK_Scalar1);
         canvas->translate(-SkIntToScalar(100), -SkIntToScalar(50));
-        canvas->drawPicture(*pict);
+        canvas->drawPicture(pict);
         canvas->restore();
 
         canvas->save();
         canvas->translate(SkIntToScalar(200), SkIntToScalar(150));
         canvas->scale(SK_Scalar1, -SK_Scalar1);
         canvas->translate(0, -SkIntToScalar(50));
-        canvas->drawPicture(*pict);
+        canvas->drawPicture(pict);
         canvas->restore();
 
         canvas->save();
         canvas->translate(SkIntToScalar(100), SkIntToScalar(100));
         canvas->scale(-SK_Scalar1, SK_Scalar1);
         canvas->translate(-SkIntToScalar(100), 0);
-        canvas->drawPicture(*pict);
+        canvas->drawPicture(pict);
         canvas->restore();
 
 #ifdef SK_DEVELOPER
         if (false) {
             SkDebugfDumper dumper;
             SkDumpCanvas dumpCanvas(&dumper);
-            dumpCanvas.drawPicture(*pict);
+            dumpCanvas.drawPicture(pict);
         }
 #endif
 
         // This used to re-record the sub-picture and redraw the parent
         // A capability that is now forbidden!
 
         SkRandom rand(SampleCode::GetAnimTime());
         canvas->translate(SkIntToScalar(10), SkIntToScalar(250));
-        canvas->drawPicture(*fPicture);
+        canvas->drawPicture(fPicture);
         delayInval(500);
     }
 
 private:
     #define INVAL_ALL_TYPE  "inval-all"
 
     void delayInval(SkMSec delay) {
         (new SkEvent(INVAL_ALL_TYPE, this->getSinkID()))->postDelay(delay);
     }
 
     virtual bool onEvent(const SkEvent& evt) {
         if (evt.isType(INVAL_ALL_TYPE)) {
             this->inval(NULL);
             return true;
         }
         return this->INHERITED::onEvent(evt);
     }
 
     SkPicture*  fPicture;
     SkPicture*  fSubPicture;
 
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new PictureView; }
 static SkViewRegister reg(MyFactory);