Refactor method used to disable peephole optimizations

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 64 matching lines @@
         (*postOptPattern)[2] = SAVE_LAYER;
         (*postOptPattern)[3] = DRAW_BITMAP_RECT_TO_RECT;
         (*postOptPattern)[4] = RESTORE;
         (*postOptPattern)[5] = RESTORE;
         (*postOptPattern)[6] = RESTORE;
     }
 
     SkPicture* result = new SkPicture;
 
     // have to disable the optimizations while generating the picture
-    SkCanvas* canvas = result->beginRecording(100, 100,
-                         SkPicture::kDisableRecordOptimizations_RecordingFlag);
+    SkCanvas* canvas = result->beginRecording(100, 100);
+    result->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 114 matching lines @@
         (*postOptPattern)[5] = DRAW_BITMAP_RECT_TO_RECT;
         (*postOptPattern)[6] = RESTORE;
         (*postOptPattern)[7] = RESTORE;
         (*postOptPattern)[8] = RESTORE;
         (*postOptPattern)[9] = RESTORE;
     }
 
     SkPicture* result = new SkPicture;
 
     // have to disable the optimizations while generating the picture
-    SkCanvas* canvas = result->beginRecording(100, 100,
-                         SkPicture::kDisableRecordOptimizations_RecordingFlag);
+    SkCanvas* canvas = result->beginRecording(100, 100);
+    result->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 178 matching lines @@
     }
 
     SkBitmap fCheckerboard;
 
     typedef skiagm::GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM( return new OptimizationsGM; )