| Index: src/core/SkPicturePlayback.cpp
 | 
| diff --git a/src/core/SkPicturePlayback.cpp b/src/core/SkPicturePlayback.cpp
 | 
| index 514769dbace20ceb146228d7bbb6d6ccf4f749e7..5a89f26be55b6e4e86c7b8a3c3cfa159985d3151 100644
 | 
| --- a/src/core/SkPicturePlayback.cpp
 | 
| +++ b/src/core/SkPicturePlayback.cpp
 | 
| @@ -1220,12 +1220,22 @@ void SkPicturePlayback::draw(SkCanvas& canvas, SkDrawPictureCallback* callback)
 | 
|                  canvas.rotate(reader.readScalar());
 | 
|                  break;
 | 
|              case SAVE:
 | 
| +#ifdef SK_SUPPORT_LEGACY_SAVEFLAGS
 | 
|                  canvas.save((SkCanvas::SaveFlags) reader.readInt());
 | 
| +#else
 | 
| +                reader.readInt(); // Consume SaveFlags.
 | 
| +                canvas.save();
 | 
| +#endif
 | 
|                  break;
 | 
|              case SAVE_LAYER: {
 | 
|                  const SkRect* boundsPtr = this->getRectPtr(reader);
 | 
|                  const SkPaint* paint = this->getPaint(reader);
 | 
| +#ifdef SK_SUPPORT_LEGACY_SAVEFLAGS
 | 
|                  canvas.saveLayer(boundsPtr, paint, (SkCanvas::SaveFlags) reader.readInt());
 | 
| +#else
 | 
| +                reader.readInt(); // Consume SaveFlags.
 | 
| +                canvas.saveLayer(boundsPtr, paint);
 | 
| +#endif
 | 
|                  } break;
 | 
|              case SCALE: {
 | 
|                  SkScalar sx = reader.readScalar();
 | 
| 
 |