Add testing of optimizations to GM

src/core/SkPictureRecord.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 "SkPictureRecord.h"
 #include "SkTSearch.h"
 #include "SkPixelRef.h"
@@ skipping 394 matching lines @@
     convert_command_to_noop(writer, saveLayerInfo.fOffset);
     uint32_t* ptr = writer->peek32(dbmInfo.fOffset+dbmPaintOffset);
     SkASSERT(dbmPaintId == *ptr);
     *ptr = data->index();
     return true;
 }
 
 /*
  * Restore has just been called (but not recorded), look back at the
  * matching save* and see if we are in the configuration:
- *   SAVE_LAYER
+ *   SAVE_LAYER (with NULL == bounds)
  *      SAVE
  *         CLIP_RECT
  *         DRAW_BITMAP|DRAW_BITMAP_MATRIX|DRAW_BITMAP_NINE|DRAW_BITMAP_RECT_TO_RECT
  *      RESTORE
  *   RESTORE
  * where the saveLayer's color can be moved into the drawBitmap*'s paint
  */
 static bool remove_save_layer2(SkWriter32* writer, int32_t offset,
                                SkPaintDictionary* paintDict) {
 
@@ skipping 132 matching lines @@
     if (fRestoreOffsetStack.count() == 0) {
         return;
     }
 
     if (fRestoreOffsetStack.count() == fFirstSavedLayerIndex) {
         fFirstSavedLayerIndex = kNoSavedLayerIndex;
     }
 
     uint32_t initialOffset, size;
     size_t opt;
-    for (opt = 0; opt < SK_ARRAY_COUNT(gPictureRecordOpts); ++opt) {
-        if ((*gPictureRecordOpts[opt].fProc)(&fWriter, fRestoreOffsetStack.top(), &fPaints)) {
-            // Some optimization fired so don't add the RESTORE
-            size = 0;
-            initialOffset = fWriter.size();
-            apply_optimization_to_bbh(gPictureRecordOpts[opt].fType,
-                                      fStateTree, fBoundingHierarchy);
-            break;
+    if (!(fRecordFlags & SkPicture::kDisableRecordOptimizations_RecordingFlag)) {
+        for (opt = 0; opt < SK_ARRAY_COUNT(gPictureRecordOpts); ++opt) {
+            if ((*gPictureRecordOpts[opt].fProc)(&fWriter, fRestoreOffsetStack.top(), &fPaints)) {
+                // Some optimization fired so don't add the RESTORE
+                size = 0;
+                initialOffset = fWriter.size();
+                apply_optimization_to_bbh(gPictureRecordOpts[opt].fType,
+                                          fStateTree, fBoundingHierarchy);
+                break;
+            }
         }
-    }
+    } 
 
-    if (SK_ARRAY_COUNT(gPictureRecordOpts) == opt) {
+    if ((fRecordFlags & SkPicture::kDisableRecordOptimizations_RecordingFlag) ||
+        SK_ARRAY_COUNT(gPictureRecordOpts) == opt) {
         // No optimization fired so add the RESTORE
         fillRestoreOffsetPlaceholdersForCurrentStackLevel((uint32_t)fWriter.size());
         size = 1 * kUInt32Size; // RESTORE consists solely of 1 op code
         initialOffset = this->addDraw(RESTORE, &size);
     }
 
     fRestoreOffsetStack.pop();
 
     validate(initialOffset, size);
     return this->INHERITED::restore();
@@ skipping 857 matching lines @@
 void SkPictureRecord::validateRegions() const {
     int count = fRegions.count();
     SkASSERT((unsigned) count < 0x1000);
     for (int index = 0; index < count; index++) {
         const SkFlatData* region = fRegions[index];
         SkASSERT(region);
 //        region->validate();
     }
 }
 #endif