Revert "Temporary change to keep chrome happy."

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 265 matching lines @@
     if (PICTURE_VERSION != info.fVersion) {
         return false;
     }
 
     if (pInfo != NULL) {
         *pInfo = info;
     }
     return true;
 }
 
-SkPicture::SkPicture(SkStream* stream, bool* success, InstallPixelRefProc proc) {
-    fRecord = NULL;
-    SkAutoTUnref<SkPicture> picture(CreateFromStream(stream, proc));
-    if (NULL == picture.get()) {
-        fPlayback = NULL;
-        fWidth = fHeight = 0;
-        if (success) {
-            *success = false;
-        }
-    } else {
-        fPlayback = picture->fPlayback;
-        picture->fPlayback = NULL;
-        fWidth = picture->fWidth;
-        fHeight = picture->fHeight;
-        if (success) {
-            *success = true;
-        }
-    }
-}
-
 SkPicture::SkPicture(SkPicturePlayback* playback, int width, int height)
     : fPlayback(playback)
     , fRecord(NULL)
     , fWidth(width)
     , fHeight(height) {}
 
 SkPicture* SkPicture::CreateFromStream(SkStream* stream, InstallPixelRefProc proc) {
     SkPictInfo info;
 
     if (!StreamIsSKP(stream, &info)) {
@@ skipping 45 matching lines @@
 }
 
 #ifdef SK_BUILD_FOR_ANDROID
 void SkPicture::abortPlayback() {
     if (NULL == fPlayback) {
         return;
     }
     fPlayback->abort();
 }
 #endif