Allow supporting older PICTURE_VERSIONs.

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 "SkErrorInternals.h"
 #include "SkPictureFlat.h"
 #include "SkPicturePlayback.h"
 #include "SkPictureRecord.h"
 
 #include "SkCanvas.h"
 #include "SkChunkAlloc.h"
 #include "SkDevice.h"
 #include "SkPicture.h"
 #include "SkRegion.h"
 #include "SkStream.h"
@@ skipping 256 matching lines @@
     if (success) {
         *success = false;
     }
     fRecord = NULL;
     fPlayback = NULL;
     fWidth = fHeight = 0;
 
     SkPictInfo info;
 
     if (!stream->read(&info, sizeof(info))) {
-        return;
-    }
-    if (PICTURE_VERSION != info.fVersion) {
+        SkErrorInternals::SetError(kParseError_SkError, "Failed to parse skp info.");
         return;
     }
 
+    if (info.fVersion < 10 || info.fVersion > PICTURE_VERSION) {

[scroggo, 2013/04/29 19:00:40]

This needs to be duplicated in QT/SkDebuggerGUI.cpp in order to play back the
older skp files.

+        SkErrorInternals::SetError(kParseError_SkError, "skp version %d not supported.",
+                                   info.fVersion);
+        return;
+    }
+
     if (stream->readBool()) {
         fPlayback = SkNEW_ARGS(SkPicturePlayback, (stream, info, proc));
     }
 
     // do this at the end, so that they will be zero if we hit an error.
     fWidth = info.fWidth;
     fHeight = info.fHeight;
     if (success) {
         *success = true;
     }
@@ skipping 33 matching lines @@
 }
 
 #ifdef SK_BUILD_FOR_ANDROID
 void SkPicture::abortPlayback() {
     if (NULL == fPlayback) {
         return;
     }
     fPlayback->abort();
 }
 #endif