Prevent picture recording from over optimizing the culling of clips.

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 460 matching lines @@
     }
 
     // now offset points to a save
     offset = -offset;
     uint32_t opSize;
     DrawType op = peek_op_and_size(writer, offset, &opSize);
     if (SAVE_LAYER == op) {
         // not ready to cull these out yet (mrr)
         return false;
     }
     SkASSERT(SAVE == op);

[robertphillips, 2013/08/13 12:12:32]

Add a kSaveSize near the kSaveLayerNoBoundsSize global and test that it is
correct in save()?

+    SkASSERT(8 == opSize);
+
+    // get the save flag (last 4-bytes of the space allocated for the opSize)
+    SkCanvas::SaveFlags saveFlag = (SkCanvas::SaveFlags) *writer->peek32(offset+4);

[robertphillips, 2013/08/13 12:12:32]

Is the evil combo we see everywhere a MatrixClip save? If not this could cause a
regression.

[djsollen, 2013/08/13 13:24:45]

Chrome doesn't do selective save and restores like this so yes we will still
catch all the evil cases.

+    if (SkCanvas::kMatrixClip_SaveFlag != (SkCanvas::kMatrixClip_SaveFlag & saveFlag)) {

[robertphillips, 2013/08/13 12:12:32]

// The following code is only correct for kMatrixClip style save's.
// TODO: set checkMatrix & checkClip booleans here and then check for the
offending operations in the following loop.

+        return false;
+    }
 
     // Walk forward until we get back to either a draw-verb (abort) or we hit
     // our restore (success).
     int32_t saveOffset = offset;
 
     offset += opSize;
     while (offset < restoreOffset) {
         op = peek_op_and_size(writer, offset, &opSize);
         if ((op > CONCAT && op < ROTATE) || (SAVE_LAYER == op)) {
             // drawing verb, abort
@@ skipping 980 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