Staged removal of SkPicture-derived classes

gm/optimizations.cpp

 /*
  * Copyright 2013 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"
 #include "SkDebugCanvas.h"
 #include "SkPictureFlat.h"
@@ skipping 63 matching lines @@
         (*postOptPattern)[1] = SAVE;
         (*postOptPattern)[2] = SAVE_LAYER;
         (*postOptPattern)[3] = DRAW_BITMAP_RECT_TO_RECT;
         (*postOptPattern)[4] = RESTORE;
         (*postOptPattern)[5] = RESTORE;
         (*postOptPattern)[6] = RESTORE;
     }
 
     SkPictureRecorder recorder;
 
-    SkCanvas* canvas = recorder.beginRecording(100, 100);
+    SkCanvas* canvas = recorder.beginRecording(100, 100, NULL, 0);
     // have to disable the optimizations while generating the picture
     recorder.internalOnly_EnableOpts(false);
 
     SkPaint saveLayerPaint;
     saveLayerPaint.setColor(0xCC000000);
 
     // saveLayer's 'bounds' parameter must be NULL for this optimization
     if (saveLayerHasPaint) {
         canvas->saveLayer(NULL, &saveLayerPaint);
     } else {
@@ skipping 113 matching lines @@
         (*postOptPattern)[4] = CLIP_RECT;
         (*postOptPattern)[5] = DRAW_BITMAP_RECT_TO_RECT;
         (*postOptPattern)[6] = RESTORE;
         (*postOptPattern)[7] = RESTORE;
         (*postOptPattern)[8] = RESTORE;
         (*postOptPattern)[9] = RESTORE;
     }
 
     SkPictureRecorder recorder;
 
-    SkCanvas* canvas = recorder.beginRecording(100, 100);
+    SkCanvas* canvas = recorder.beginRecording(100, 100, NULL, 0);
     // have to disable the optimizations while generating the picture
     recorder.internalOnly_EnableOpts(false);
 
     SkPaint saveLayerPaint;
     saveLayerPaint.setColor(0xCC000000);
 
     // saveLayer's 'bounds' parameter must be NULL for this optimization
     if (saveLayerHasPaint) {
         canvas->saveLayer(NULL, &saveLayerPaint);
     } else {
@@ skipping 122 matching lines @@
 
             canvas->save();
                 canvas->translate(SkIntToScalar(xPos), SkIntToScalar(yPos));
                 pre->draw(canvas);
                 xPos += pre->width();
             canvas->restore();
 
             // re-render the 'pre' picture and thus 'apply' the optimization
             SkPictureRecorder recorder;
 
-            SkCanvas* recordCanvas = recorder.beginRecording(pre->width(), pre->height());
+            SkCanvas* recordCanvas = recorder.beginRecording(pre->width(), pre->height(), NULL, 0);
 
             pre->draw(recordCanvas);
 
             SkAutoTUnref<SkPicture> post(recorder.endRecording());
 
             if (!(check_pattern(*post, postPattern))) {
                 WARN("Post optimization pattern mismatch");
                 SkASSERT(0);
             }
 
@@ skipping 35 matching lines @@
     }
 
     SkBitmap fCheckerboard;
 
     typedef skiagm::GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM( return new OptimizationsGM; )