split SkPictureRecorder out of SkPicture

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 61 matching lines @@
         postOptPattern->setCount(7);
         (*postOptPattern)[0] = SAVE; // extra save/restore added by extra draw
         (*postOptPattern)[1] = SAVE;
         (*postOptPattern)[2] = SAVE_LAYER;
         (*postOptPattern)[3] = DRAW_BITMAP_RECT_TO_RECT;
         (*postOptPattern)[4] = RESTORE;
         (*postOptPattern)[5] = RESTORE;
         (*postOptPattern)[6] = RESTORE;
     }
 
-    SkPicture* result = new SkPicture;
+    SkPictureRecorder recorder;
 
+    SkCanvas* canvas = recorder.beginRecording(100, 100);
     // have to disable the optimizations while generating the picture
-    SkCanvas* canvas = result->beginRecording(100, 100);
-    result->internalOnly_EnableOpts(false);
+    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 {
         canvas->saveLayer(NULL, NULL);
     }
 
     SkRect rect = { 10, 10, 90, 90 };
 
     // The dbmr2r's paint must be opaque
     SkPaint dbmr2rPaint;
     if (colorsMatch) {
         dbmr2rPaint.setColor(0xFF000000);
     } else {
         dbmr2rPaint.setColor(0xFFFF0000);
     }
 
     if (dbmr2rHasPaint) {
         canvas->drawBitmapRectToRect(checkerBoard, NULL, rect, &dbmr2rPaint);
     } else {
         canvas->drawBitmapRectToRect(checkerBoard, NULL, rect, NULL);
     }
     canvas->restore();
 
-    result->endRecording();
-
-    return result;
+    return recorder.endRecording();
 }
 
 // straight-ahead version that is seen in the skps
 static SkPicture* create_save_layer_opt_1_v1(SkTDArray<DrawType>* preOptPattern,
                                              SkTDArray<DrawType>* postOptPattern,
                                              const SkBitmap& checkerBoard) {
     return create_save_layer_opt_1(preOptPattern, postOptPattern, checkerBoard,
                                    true,   // saveLayer has a paint
                                    true,   // dbmr2r has a paint
                                    true);  // and the colors match
@@ skipping 80 matching lines @@
         (*postOptPattern)[2] = SAVE_LAYER;
         (*postOptPattern)[3] = SAVE;
         (*postOptPattern)[4] = CLIP_RECT;
         (*postOptPattern)[5] = DRAW_BITMAP_RECT_TO_RECT;
         (*postOptPattern)[6] = RESTORE;
         (*postOptPattern)[7] = RESTORE;
         (*postOptPattern)[8] = RESTORE;
         (*postOptPattern)[9] = RESTORE;
     }
 
-    SkPicture* result = new SkPicture;
+    SkPictureRecorder recorder;
 
+    SkCanvas* canvas = recorder.beginRecording(100, 100);
     // have to disable the optimizations while generating the picture
-    SkCanvas* canvas = result->beginRecording(100, 100);
-    result->internalOnly_EnableOpts(false);
+    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 {
         canvas->saveLayer(NULL, NULL);
     }
@@ skipping 12 matching lines @@
     }
 
     if (dbmr2rHasPaint) {
         canvas->drawBitmapRectToRect(checkerBoard, NULL, rect, &dbmr2rPaint);
     } else {
         canvas->drawBitmapRectToRect(checkerBoard, NULL, rect, NULL);
     }
     canvas->restore();
     canvas->restore();
 
-    result->endRecording();
-
-    return result;
+    return recorder.endRecording();
 }
 
 // straight-ahead version that is seen in the skps
 static SkPicture* create_save_layer_opt_2_v1(SkTDArray<DrawType>* preOptPattern,
                                              SkTDArray<DrawType>* postOptPattern,
                                              const SkBitmap& checkerBoard) {
     return create_save_layer_opt_2(preOptPattern, postOptPattern, checkerBoard,
                                    true,   // saveLayer has a paint
                                    true,   // dbmr2r has a paint
                                    true);  // and the colors match
@@ skipping 85 matching lines @@
                 SkASSERT(0);
             }
 
             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
-            SkAutoTUnref<SkPicture> post(new SkPicture);
+            SkPictureRecorder recorder;
 
-            SkCanvas* recordCanvas = post->beginRecording(pre->width(), pre->height());
+            SkCanvas* recordCanvas = recorder.beginRecording(pre->width(), pre->height());
 
             pre->draw(recordCanvas);
 
-            post->endRecording();
+            SkAutoTUnref<SkPicture> post(recorder.endRecording());
 
             if (!(check_pattern(*post, postPattern))) {
                 WARN("Post optimization pattern mismatch");
                 SkASSERT(0);
             }
 
             canvas->save();
                 canvas->translate(SkIntToScalar(xPos), SkIntToScalar(yPos));
                 post->draw(canvas);
                 xPos += post->width();
@@ skipping 31 matching lines @@
     }
 
     SkBitmap fCheckerboard;
 
     typedef skiagm::GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM( return new OptimizationsGM; )