Staged removal of SkPicture-derived classes

gm/distantclip.cpp

 
 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
@@ skipping 15 matching lines @@
     SkISize onISize() { return make_isize(100, 100); }
 
     virtual void onDraw(SkCanvas* canvas) {
         int offset = 35000;
         int extents = 1000;
 
         SkPictureRecorder recorder;
         // We record a picture of huge vertical extents in which we clear the canvas to red, create
         // a 'extents' by 'extents' round rect clip at a vertical offset of 'offset', then draw
         // green into that.
-        SkCanvas* rec = recorder.beginRecording(100, offset + extents);
+        SkCanvas* rec = recorder.beginRecording(100, offset + extents, NULL, 0);
         rec->drawColor(0xffff0000);
         rec->save();
         SkRect r = {
             SkIntToScalar(-extents),
             SkIntToScalar(offset - extents),
             SkIntToScalar(extents),
             SkIntToScalar(offset + extents)
         };
         SkPath p;
         p.addRoundRect(r, 5, 5);
         rec->clipPath(p, SkRegion::kIntersect_Op, true);
         rec->drawColor(0xff00ff00);
         rec->restore();
         SkAutoTUnref<SkPicture> pict(recorder.endRecording());
 
         // Next we play that picture into another picture of the same size.
-        pict->draw(recorder.beginRecording(100, offset + extents));
+        pict->draw(recorder.beginRecording(100, offset + extents, NULL, 0));
         SkAutoTUnref<SkPicture> pict2(recorder.endRecording());
 
         // Finally we play the part of that second picture that should be green into the canvas.
         canvas->save();
         canvas->translate(SkIntToScalar(extents / 2),
                           SkIntToScalar(-(offset - extents / 2)));
         pict2->draw(canvas);
         canvas->restore();
 
         // If the image is red, we erroneously decided the clipPath was empty and didn't record
         // the green drawColor, if it's green we're all good.
     }
 
 private:
     typedef GM INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new DistantClipGM; }
 static GMRegistry reg(MyFactory);
 
 }