Ensure playing back a picture always balances saves and restores

src/core/SkPicturePlayback.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 <new>
 #include "SkBBoxHierarchy.h"
 #include "SkPicturePlayback.h"
 #include "SkPictureRecord.h"
@@ skipping 1303 matching lines @@
 
         if (it.isValid()) {
             uint32_t skipTo = it.nextDraw();
             if (kDrawComplete == skipTo) {
                 break;
             }
             reader.setOffset(skipTo);
         }
     }
 
+    canvas.restoreToCount(originalSaveCount);

[scroggo, 2014/05/16 18:20:53]

There are a couple of other places where we return from this function. In one of
them (if the callback aborts the drawing), we also restoreToCount, and in the
other (Android only; another version of aborting playback - as a side note, it
seems like that could be implemented in Android as a callback and we can
eliminate some code?) we do not. It seems like we should in both cases (as long
as the latter sticks around), we should do the restore.

I think it would make sense to use a SkAutoCanvasRestore(&canvas, false) early
on. That would make sure that we catch all exit cases (also that the restore
happens last).

[robertphillips, 2014/05/16 19:18:15]

Done.

+
 #ifdef SPEW_CLIP_SKIPPING
     {
         size_t size =  skipRect.fSize + skipRRect.fSize + skipPath.fSize + skipRegion.fSize +
                 skipCull.fSize;
         SkDebugf("--- Clip skips %d%% rect:%d rrect:%d path:%d rgn:%d cull:%d\n",
              size * 100 / reader.offset(), skipRect.fCount, skipRRect.fCount,
                  skipPath.fCount, skipRegion.fCount, skipCull.fCount);
         SkDebugf("--- Total ops: %d\n", opCount);
     }
 #endif
@@ skipping 504 matching lines @@
     for (index = 0; index < fPictureCount; index++)
         bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
             "picture%p, ", fPictureRefs[index]);
     if (fPictureCount > 0)
         SkDebugf("%s0};\n", pBuffer);
 
     const_cast<SkPicturePlayback*>(this)->dumpStream();
 }
 
 #endif