split SkPictureRecorder out of SkPicture

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 43 matching lines @@
                        paint);
 }
 
 class PictureView : public SampleView {
     SkBitmap fBitmap;
 public:
     PictureView() {
 
         fBitmap = load_bitmap();
 
-        fPicture = new SkPicture;
-        SkCanvas* canvas = fPicture->beginRecording(100, 100);
+        SkPictureRecorder recorder;
+
+        recorder.beginRecording(100, 100);
+        fSubPicture = recorder.endRecording();
+
+        SkCanvas* canvas = recorder.beginRecording(100, 100);
         SkPaint paint;
         paint.setAntiAlias(true);
 
         canvas->drawBitmap(fBitmap, 0, 0, NULL);
 
         drawCircle(canvas, 50, SK_ColorBLACK);
-        fSubPicture = new SkPicture;
         canvas->drawPicture(*fSubPicture);
         canvas->translate(SkIntToScalar(50), 0);
         canvas->drawPicture(*fSubPicture);
         canvas->translate(0, SkIntToScalar(50));
         canvas->drawPicture(*fSubPicture);
         canvas->translate(SkIntToScalar(-50), 0);
         canvas->drawPicture(*fSubPicture);
-        // fPicture now has (4) references to us. We can release ours, and just
-        // unref fPicture in our destructor, and it will in turn take care of
+
+        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() {
         fPicture->unref();
     }
 
 protected:
     // overrides from SkEventSink
@@ skipping 24 matching lines @@
                            SkIntToScalar(40), paint);
         canvas->drawData(afterStr, sizeof(afterStr));
         paint.setColor(SK_ColorBLACK);
         paint.setTextSize(SkIntToScalar(40));
         canvas->drawText("Picture", 7, SkIntToScalar(50), SkIntToScalar(62),
                          paint);
 
     }
 
     virtual void onDrawContent(SkCanvas* canvas) {
-        drawSomething(canvas);
+        this->drawSomething(canvas);
 
-        SkPicture* pict = new SkPicture;
-        SkAutoUnref aur(pict);
-
-        drawSomething(pict->beginRecording(100, 100));
-        pict->endRecording();
+        SkPictureRecorder recorder;
+        this->drawSomething(recorder.beginRecording(100, 100));
+        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->restore();
 
         canvas->save();
         canvas->translate(SkIntToScalar(200), SkIntToScalar(150));
@@ skipping 10 matching lines @@
         canvas->restore();
 
 #ifdef SK_DEVELOPER
         if (false) {
             SkDebugfDumper dumper;
             SkDumpCanvas dumpCanvas(&dumper);
             dumpCanvas.drawPicture(*pict);
         }
 #endif
 
-        // test that we can re-record a subpicture, and see the results
+        // 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));
-        drawCircle(fSubPicture->beginRecording(50, 50), 25,
-                   rand.nextU() | 0xFF000000);
         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);