Replace SkPicture(SkStream) constructors with a factory.

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 246 matching lines @@
     this->endRecording();
     if (fPlayback) {
         fPlayback->draw(*surface, callback);
     }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "SkStream.h"
 
-SkPicture::SkPicture(SkStream* stream) {
-    this->initFromStream(stream, NULL, NULL);
+bool SkPicture::StreamIsSKP(SkStream* stream, SkPictInfo* info) {
+    if (NULL == stream || NULL == info) {

[reed1, 2013/06/24 22:24:14]

Why do we return false on info==null?

1. crashing is one option
2. just retuning a bool is another

Since we can return false *after* reading info, perhaps it would be better to
always perform that on a stack object, and then only if we're going to return
true do we (after checking for null) copy that into the caller's info.

[scroggo, 2013/06/25 15:36:50]

Done.

+        return false;
+    }
+    if (!stream->read(info, sizeof(SkPictInfo))) {
+        return false;
+    }
+    if (PICTURE_VERSION != info->fVersion) {
+        return false;
+    }
+    return stream->readBool();
 }
 
-SkPicture::SkPicture(SkStream* stream, bool* success, InstallPixelRefProc proc) {
-    this->initFromStream(stream, success, proc);
-}
+SkPicture::SkPicture(SkPicturePlayback* playback, int width, int height)
+    : fPlayback(playback)
+    , fRecord(NULL)
+    , fWidth(width)
+    , fHeight(height) {}
 
-void SkPicture::initFromStream(SkStream* stream, bool* success, InstallPixelRefProc proc) {
-    if (success) {
-        *success = false;
-    }
-    fRecord = NULL;
-    fPlayback = NULL;
-    fWidth = fHeight = 0;
-
+SkPicture* SkPicture::CreateFromStream(SkStream* stream, InstallPixelRefProc proc) {
     SkPictInfo info;
 
-    if (!stream->read(&info, sizeof(info))) {
-        return;
-    }
-    if (PICTURE_VERSION != info.fVersion) {
-        return;
+    if (!StreamIsSKP(stream, &info)) {
+        return NULL;
     }
 
-    if (stream->readBool()) {
-        fPlayback = SkNEW_ARGS(SkPicturePlayback, (stream, info, proc));
-    }
+    SkPicturePlayback* playback = 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;
-    }
+    return SkNEW_ARGS(SkPicture, (playback, info.fWidth, info.fHeight));
 }
 
 void SkPicture::serialize(SkWStream* stream, EncodeBitmap encoder) const {
     SkPicturePlayback* playback = fPlayback;
 
     if (NULL == playback && fRecord) {
         playback = SkNEW_ARGS(SkPicturePlayback, (*fRecord));
     }
 
     SkPictInfo info;
@@ skipping 23 matching lines @@
 }
 
 #ifdef SK_BUILD_FOR_ANDROID
 void SkPicture::abortPlayback() {
     if (NULL == fPlayback) {
         return;
     }
     fPlayback->abort();
 }
 #endif