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

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 413 matching lines @@
     if (!InternalOnly_StreamIsSKP(stream, &info)) {
         return NULL;
     }
 
     // Check to see if there is a playback to recreate.
     if (stream->readBool()) {
         SkPictureData* data = SkPictureData::CreateFromStream(stream, info, proc);
         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;
 }
 
 // fRecord OK
 SkPicture* SkPicture::CreateFromBuffer(SkReadBuffer& buffer) {
     SkPictInfo info;
 
     if (!InternalOnly_BufferIsSKP(buffer, &info)) {
         return NULL;
     }
 
     // Check to see if there is a playback to recreate.
     if (buffer.readBool()) {
         SkPictureData* data = SkPictureData::CreateFromBuffer(buffer, info);
         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;
 }
 
 // fRecord OK
 void SkPicture::createHeader(SkPictInfo* info) const {
     // Copy magic bytes at the beginning of the header
     SkASSERT(sizeof(kMagic) == 8);
     SkASSERT(sizeof(kMagic) == sizeof(info->fMagic));
@@ skipping 157 matching lines @@
 int SkPicture::approximateOpCount() const {
     SkASSERT(fRecord.get() || fData.get());
     if (fRecord.get()) {
         return fRecord->count();
     }
     if (fData.get()) {
         return fData->opCount();
     }
     return 0;
 }