Revert "Temporary change to keep chrome happy."

Now that chrome has https://chromiumcodereview.appspot.com/18078003/,
this is no longer needed.

Fully switched over to using CreateFromStream!

Review URL: https://codereview.chromium.org/18655008

git-svn-id: http://skia.googlecode.com/svn/trunk@9911 2bbb7eff-a529-9590-31e7-b0007b416f81

2 files changed, 0 insertions, 26 deletions

diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h
index eb3fcc5587..0bac3f7e9e 100644
--- a/include/core/SkPicture.h
+++ b/include/core/SkPicture.h
@@ -58,12 +58,6 @@ public:
     typedef bool (*InstallPixelRefProc)(const void* src, size_t length, SkBitmap* dst);
 
     /**
-     *  @Deprecated - use CreateFromStream instead.
-     *  Create an SkPicture from an SkStream.
-     */
-    SkPicture(SkStream*, bool*, InstallPixelRefProc);
-
-    /**
      *  Recreate a picture that was serialized into a stream.
      *  @param SkStream Serialized picture data.
      *  @param proc Function pointer for installing pixelrefs on SkBitmaps representing the
diff --git a/src/core/SkPicture.cpp b/src/core/SkPicture.cpp
index 07d324fdb7..2b488dec02 100644
--- a/src/core/SkPicture.cpp
+++ b/src/core/SkPicture.cpp
@@ -283,26 +283,6 @@ bool SkPicture::StreamIsSKP(SkStream* stream, SkPictInfo* pInfo) {
     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)