Revert of Serialization of SkPictureImageFilter

Revert of Serialization of SkPictureImageFilter (https://codereview.chromium.org/138063005/)

Reason for revert:
SKP bot failed

Original issue's description:
> Serialization of SkPictureImageFilter
> 
> BUG=skia:
> 
> Committed: http://code.google.com/p/skia/source/detail?r=13347
> 
> Committed: http://code.google.com/p/skia/source/detail?r=13354

TBR=senorblanco@google.com,reed@google.com,mtklein@google.com,sugoi@google.com,senorblanco@chromium.org,robertphillips@google.com,scroggo@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:

[sugoi1, 2014-02-07 04:57:27]

Created Revert of Serialization of SkPictureImageFilter

[commit-bot: I haz the power, 2014-02-07 04:57:37]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-02-07 04:57:37]

No LGTM from a valid reviewer yet. Only full committers are accepted.
Even if an LGTM may have been provided, it was from a non-committer or
a lowly provisional committer, _not_ a full super star committer.
See http://www.chromium.org/getting-involved/become-a-committer
Note that this has nothing to do with OWNERS files.

[sugoi1, 2014-02-07 04:58:19]

The CQ bit was checked by sugoi@chromium.org

[commit-bot: I haz the power, 2014-02-07 04:58:26]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-02-07 04:58:27]

No LGTM from a valid reviewer yet. Only full committers are accepted.
Even if an LGTM may have been provided, it was from a non-committer or
a lowly provisional committer, _not_ a full super star committer.
See http://www.chromium.org/getting-involved/become-a-committer
Note that this has nothing to do with OWNERS files.

[fmalita_google_do_not_use, 2014-02-07 05:39:46]

lgtm

[commit-bot: I haz the power, 2014-02-07 05:39:49]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/sugoi@chromium.org/149283003/1

[commit-bot: I haz the power, 2014-02-07 05:39:52]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-02-07 05:39:52]

Failed to apply patch for src/core/SkPicture.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file src/core/SkPicture.cpp
  Hunk #2 FAILED at 273.
  1 out of 5 hunks FAILED -- saving rejects to file src/core/SkPicture.cpp.rej

Patch:       src/core/SkPicture.cpp
Index: src/core/SkPicture.cpp
diff --git a/src/core/SkPicture.cpp b/src/core/SkPicture.cpp
index
0d31ab403ebf4fd2bbae50f27ac4cdab4ddc1d29..ca1b6fa22a94cf0f84d7bd6ac0c61a7338f7c12e
100644
--- a/src/core/SkPicture.cpp
+++ b/src/core/SkPicture.cpp
@@ -265,7 +265,6 @@
 #include "SkStream.h"
 
 static const char kMagic[] = { 's', 'k', 'i', 'a', 'p', 'i', 'c', 't' };
-static const size_t kHeaderSize = sizeof(kMagic) + sizeof(SkPictInfo);
 
 bool SkPicture::StreamIsSKP(SkStream* stream, SkPictInfo* pInfo) {
     if (NULL == stream) {
@@ -274,37 +273,13 @@
 
     // Check magic bytes.
     char magic[sizeof(kMagic)];
-    if (!stream->read(magic, sizeof(kMagic)) ||
-        (0 != memcmp(magic, kMagic, sizeof(kMagic)))) {
+    stream->read(magic, sizeof(kMagic));
+    if (0 != memcmp(magic, kMagic, sizeof(kMagic))) {
         return false;
     }
 
     SkPictInfo info;
     if (!stream->read(&info, sizeof(SkPictInfo))) {
-        return false;
-    }
-
-    if (PICTURE_VERSION != info.fVersion) {
-        return false;
-    }
-
-    if (pInfo != NULL) {
-        *pInfo = info;
-    }
-    return true;
-}
-
-bool SkPicture::BufferIsSKP(SkReadBuffer& buffer, SkPictInfo* pInfo) {
-    // Check magic bytes.
-    char magic[sizeof(kMagic)];
-    
-    if (!buffer.readByteArray(magic, sizeof(kMagic)) ||
-        (0 != memcmp(magic, kMagic, sizeof(kMagic)))) {
-        return false;
-    }
-
-    SkPictInfo info;
-    if (!buffer.readByteArray(&info, sizeof(SkPictInfo))) {
         return false;
     }
 
@@ -345,46 +320,6 @@
     return SkNEW_ARGS(SkPicture, (playback, info.fWidth, info.fHeight));
 }
 
-SkPicture* SkPicture::CreateFromBuffer(SkReadBuffer& buffer) {
-    SkPictInfo info;
-
-    if (!BufferIsSKP(buffer, &info)) {
-        return NULL;
-    }
-
-    SkPicturePlayback* playback;
-    // Check to see if there is a playback to recreate.
-    if (buffer.readBool()) {
-        playback = SkPicturePlayback::CreateFromBuffer(buffer);
-        if (NULL == playback) {
-            return NULL;
-        }
-    } else {
-        playback = NULL;
-    }
-
-    return SkNEW_ARGS(SkPicture, (playback, info.fWidth, info.fHeight));
-}
-
-void SkPicture::createHeader(void* header) const {
-    // Copy magic bytes at the beginning of the header
-    SkASSERT(sizeof(kMagic) == 8);
-    memcpy(header, kMagic, sizeof(kMagic));
-
-    // Set piture info after magic bytes in the header
-    SkPictInfo* info = (SkPictInfo*)(((char*)header) + sizeof(kMagic));
-    info->fVersion = PICTURE_VERSION;
-    info->fWidth = fWidth;
-    info->fHeight = fHeight;
-    info->fFlags = SkPictInfo::kCrossProcess_Flag;
-    // TODO: remove this flag, since we're always float (now)
-    info->fFlags |= SkPictInfo::kScalarIsFloat_Flag;
-
-    if (8 == sizeof(void*)) {
-        info->fFlags |= SkPictInfo::kPtrIs64Bit_Flag;
-    }
-}
-
 void SkPicture::serialize(SkWStream* stream, EncodeBitmap encoder) const {
     SkPicturePlayback* playback = fPlayback;
 
@@ -392,9 +327,24 @@
         playback = SkNEW_ARGS(SkPicturePlayback, (*fRecord));
     }
 
-    char header[kHeaderSize];
-    createHeader(&header);
-    stream->write(header, kHeaderSize);
+    SkPictInfo info;
+
+    info.fVersion = PICTURE_VERSION;
+    info.fWidth = fWidth;
+    info.fHeight = fHeight;
+    info.fFlags = SkPictInfo::kCrossProcess_Flag;
+    // TODO: remove this flag, since we're always float (now)
+    info.fFlags |= SkPictInfo::kScalarIsFloat_Flag;
+
+    if (8 == sizeof(void*)) {
+        info.fFlags |= SkPictInfo::kPtrIs64Bit_Flag;
+    }
+
+    // Write 8 magic bytes to ID this file format.
+    SkASSERT(sizeof(kMagic) == 8);
+    stream->write(kMagic, sizeof(kMagic));
+
+    stream->write(&info, sizeof(info));
     if (playback) {
         stream->writeBool(true);
         playback->serialize(stream, encoder);
@@ -407,28 +357,6 @@
     }
 }
 
-void SkPicture::flatten(SkWriteBuffer& buffer) const {
-    SkPicturePlayback* playback = fPlayback;
-
-    if (NULL == playback && fRecord) {
-        playback = SkNEW_ARGS(SkPicturePlayback, (*fRecord));
-    }
-
-    char header[kHeaderSize];
-    createHeader(&header);
-    buffer.writeByteArray(header, kHeaderSize);
-    if (playback) {
-        buffer.writeBool(true);
-        playback->flatten(buffer);
-        // delete playback if it is a local version (i.e. cons'd up just now)
-        if (playback != fPlayback) {
-            SkDELETE(playback);
-        }
-    } else {
-        buffer.writeBool(false);
-    }
-}
-
 bool SkPicture::willPlayBackBitmaps() const {
     if (!fPlayback) return false;
     return fPlayback->containsBitmaps();

[fmalita_google_do_not_use, 2014-02-07 05:49:05]

On 2014/02/07 05:39:52, I haz the power (commit-bot) wrote:
> Failed to apply patch for src/core/SkPicture.cpp:
> While running patch -p1 --forward --force --no-backup-if-mismatch;
>   patching file src/core/SkPicture.cpp
>   Hunk #2 FAILED at 273.
>   1 out of 5 hunks FAILED -- saving rejects to file src/core/SkPicture.cpp.rej

Wha!? Must be a conflict with the sanitizer. Will upload a combined revert.

[scroggo, 2014-02-13 22:14:29]

On 2014/02/07 05:49:05, fmalita wrote:
> On 2014/02/07 05:39:52, I haz the power (commit-bot) wrote:
> > Failed to apply patch for src/core/SkPicture.cpp:
> > While running patch -p1 --forward --force --no-backup-if-mismatch;
> >   patching file src/core/SkPicture.cpp
> >   Hunk #2 FAILED at 273.
> >   1 out of 5 hunks FAILED -- saving rejects to file
src/core/SkPicture.cpp.rej
> 
> Wha!? Must be a conflict with the sanitizer. Will upload a combined revert.

This was committed in https://codereview.chromium.org/153583007