Fix error revealed by Android unit test

src/core/SkPicture.cpp

 
 /*
  * Copyright 2007 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkPictureFlat.h"
@@ skipping 116 matching lines @@
     : fAccelData(NULL) {
     this->needsNewGenID();
     fPlayback = NULL;
     fWidth = fHeight = 0;
 }
 
 // This method makes a SkPicturePlayback object from an in-progress recording.
 // Unfortunately, it does not include the restoreToCount of a real endRecording
 // call.
 SkPicturePlayback* SkPicture::FakeEndRecording(const SkPicture* resourceSrc,
-                                               const SkPictureRecord& record,
-                                               bool deepCopy) {
+                                               const SkPictureRecord& record) {
     SkPictInfo info;
     resourceSrc->createHeader(&info);
-    return SkNEW_ARGS(SkPicturePlayback, (resourceSrc, record, info, deepCopy));
+
+    // FakeEndRecording is only called from partialReplay. For that use case

[scroggo, 2014/06/10 13:31:25]

Originally it had multiple callers. Does it make sense to move this code inside
partialReplay?

[robertphillips, 2014/06/10 17:26:28]

It will go away entirely in a later CL.

+    // we cannot be certain that the next call to SkWriter32::overwriteTAt
+    // will be preceded by an append (i.e., that the required copy on write
+    // will occur). In this case just force a deep copy of the operations.

[reed1, 2014/06/10 12:29:03]

just a suggestion to help document...

const bool deepCopy = true;
return SkNEW.... (..., deepCopy));

[robertphillips, 2014/06/10 17:26:27]

Done.

+    return SkNEW_ARGS(SkPicturePlayback, (resourceSrc, record, info, true));
 }
 
 SkPicture::SkPicture(const SkPicture& src)
     : INHERITED()
     , fAccelData(NULL)
     , fContentInfo(src.fContentInfo) {
     this->needsNewGenID();
     fWidth = src.fWidth;
     fHeight = src.fHeight;
 
@@ skipping 413 matching lines @@
     } while (SK_InvalidGenID == genID);
     return genID;
 }
 
 uint32_t SkPicture::uniqueID() const {
     if (SK_InvalidGenID == fUniqueID) {
         fUniqueID = next_picture_generation_id();
     }
     return fUniqueID;
 }