Plumb in "bleed" flag

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 255 matching lines @@
 
 bool SkPicture::StreamIsSKP(SkStream* stream, SkPictInfo* pInfo) {
     if (NULL == stream) {
         return false;
     }
 
     SkPictInfo info;
     if (!stream->read(&info, sizeof(SkPictInfo))) {
         return false;
     }
-    if (PICTURE_VERSION != info.fVersion) {
+    if (PICTURE_VERSION != info.fVersion &&
+        PRIOR_PICTURE_VERSION != info.fVersion) { // TODO: remove when .skps regenerated

[edisonn, 2013/07/29 14:51:14]

since there are multiple places that need to be updated, when the .skps are
regenerated, could we add an issue, and mark all the comments with the issue
number? That would make it simple to be found. then no need to explain.

If we do this on regular basis, at one point someone will forget to remove some
code.

Also I understand that introducing a process like this would annoy devs (it
would surely annoy me) so I let it up to you to make a cost/benefit judgment.

[robertphillips, 2013/07/29 15:27:32]

I have used a huge #define as suggested by Jim.

         return false;
     }
 
     if (pInfo != NULL) {
         *pInfo = info;
     }
     return true;
 }
 
 SkPicture::SkPicture(SkPicturePlayback* playback, int width, int height)
@@ skipping 54 matching lines @@
 }
 
 #ifdef SK_BUILD_FOR_ANDROID
 void SkPicture::abortPlayback() {
     if (NULL == fPlayback) {
         return;
     }
     fPlayback->abort();
 }
 #endif