Allow creating a picture from skp to fail.

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 292 matching lines @@
 SkPicture* SkPicture::CreateFromStream(SkStream* stream, InstallPixelRefProc proc) {
     SkPictInfo info;
 
     if (!StreamIsSKP(stream, &info)) {
         return NULL;
     }
 
     SkPicturePlayback* playback;
     // Check to see if there is a playback to recreate.
     if (stream->readBool()) {
-        playback = SkNEW_ARGS(SkPicturePlayback, (stream, info, proc));
+        bool isValid = false;

[caryclark, 2013/09/26 21:12:46]

It looks like this argues for creating a SkPicturePlayback::Create call (or
factory or whatever it should be) instead of using the constructor. Then the
function result could be NULL and isValid wouldn't needed, and the subsequent
delete call could be eliminated as well.

[reed1, 2013/09/26 21:16:07]

+1

[scroggo, 2013/09/26 22:17:46]

I think that is generally a better pattern (this change only revives the old
code which has a pointer to bool). On the other hand, that is a more invasive
change with more potential for errors. Further, SkPicturePlayback is only used
internally. I think we can put that off for a later change, and fix the crashes
that Cary is seeing in the meantime.

+        playback = SkNEW_ARGS(SkPicturePlayback, (stream, info, &isValid, proc));
+        if (!isValid) {
+            SkDELETE(playback);
+            return NULL;
+        }
     } else {
         playback = NULL;
     }
 
     return SkNEW_ARGS(SkPicture, (playback, info.fWidth, info.fHeight));
 }
 
 void SkPicture::serialize(SkWStream* stream, EncodeBitmap encoder) const {
     SkPicturePlayback* playback = fPlayback;
 
@@ skipping 28 matching lines @@
 }
 
 #ifdef SK_BUILD_FOR_ANDROID
 void SkPicture::abortPlayback() {
     if (NULL == fPlayback) {
         return;
     }
     fPlayback->abort();
 }
 #endif