Revert of Revert back to SkPictureData pictures. Huge perf regression.

src/core/SkPicture.cpp

Index: src/core/SkPicture.cpp
diff --git a/src/core/SkPicture.cpp b/src/core/SkPicture.cpp
index 160dd4b420df044adc9e03d761db7307cbcba459..70c1f67e19254209ef681dd6568f540bfbb20399 100644
--- a/src/core/SkPicture.cpp
+++ b/src/core/SkPicture.cpp
@@ -431,12 +431,8 @@
         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;
@@ -456,12 +452,8 @@
         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;