Revert back to SkPictureData pictures. Huge perf regression.

http://skiaperf.com/#108

BUG=skia:
R=reed@google.com, mtklein@google.com

Author: mtklein@chromium.org

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

diff --git a/src/core/SkPicture.cpp b/src/core/SkPicture.cpp
index 70c1f67e19254209ef681dd6568f540bfbb20399..160dd4b420df044adc9e03d761db7307cbcba459 100644 (file)
--- a/src/core/SkPicture.cpp
+++ b/src/core/SkPicture.cpp
@@ -431,8 +431,12 @@ SkPicture* SkPicture::CreateFromStream(SkStream* stream, InstallPixelRefProc pro
         if (NULL == data) {
             return NULL;
         }
+#if 0
         const SkPicture src(data, info.fWidth, info.fHeight);
         return Forwardport(src);
+#else
+        return SkNEW_ARGS(SkPicture, (data, info.fWidth, info.fHeight));
+#endif
     }
 
     return NULL;
@@ -452,8 +456,12 @@ SkPicture* SkPicture::CreateFromBuffer(SkReadBuffer& buffer) {
         if (NULL == data) {
             return NULL;
         }
+#if 0
         const SkPicture src(data, info.fWidth, info.fHeight);
         return Forwardport(src);
+#else
+        return SkNEW_ARGS(SkPicture, (data, info.fWidth, info.fHeight));
+#endif
     }
 
     return NULL;