| Index: src/core/SkPictureRecord.cpp
 | 
| diff --git a/src/core/SkPictureRecord.cpp b/src/core/SkPictureRecord.cpp
 | 
| index c5e329e7bfaffcb087205124f481af8c5ee7ca50..ccc0b580d7acd7f1cf50151062f87c6d3fb04cc6 100644
 | 
| --- a/src/core/SkPictureRecord.cpp
 | 
| +++ b/src/core/SkPictureRecord.cpp
 | 
| @@ -511,6 +511,7 @@ static bool collapse_save_clip_restore(SkWriter32* writer, int32_t offset,
 | 
|      SkASSERT(SAVE == op);
 | 
|      SkASSERT(kSaveSize == opSize);
 | 
|  
 | 
| +#ifdef SK_SUPPORT_LEGACY_SAVEFLAGS
 | 
|      // get the save flag (last 4-bytes of the space allocated for the opSize)
 | 
|      SkCanvas::SaveFlags saveFlags = (SkCanvas::SaveFlags) writer->readTAt<uint32_t>(offset + 4);
 | 
|      if (SkCanvas::kMatrixClip_SaveFlag != saveFlags) {
 | 
| @@ -519,6 +520,7 @@ static bool collapse_save_clip_restore(SkWriter32* writer, int32_t offset,
 | 
|          // offending operations in the following loop.
 | 
|          return false;
 | 
|      }
 | 
| +#endif
 | 
|  
 | 
|      // Walk forward until we get back to either a draw-verb (abort) or we hit
 | 
|      // our restore (success).
 | 
| 
 |