Revert of Revert "Serialization of SkPictureImageFilter" (https://codereview.chromium.org/153583007/)
Reason for revert:
New SKPs with version20 are in Google Storage due to http://108.170.219.160:10117/builders/Housekeeper-Nightly-RecreateSKPs/builds/22
Original issue's description:
> Revert "Serialization of SkPictureImageFilter"
>
> This reverts commit 227321b30106e57942929eb96fa5bc22544f6c9e.
>
> Revert "Sanitizing source files in Housekeeper-Nightly"
>
> This reverts commit baf28584b7636c01355f8d8d972e06aa7fb66d77.
>
> TBR=robertphillips@google.com,sugoi@google.com
>
> Committed: https://code.google.com/p/skia/source/detail?r=13356
R=robertphillips@google.com, sugoi@google.com, fmalita@google.com, fmalita@chromium.org
TBR=fmalita@chromium.org, fmalita@google.com, robertphillips@google.com, sugoi@google.com
NOTREECHECKS=true
NOTRY=true
Author: rmistry@google.com
Review URL: https://codereview.chromium.org/143163005
git-svn-id: http://skia.googlecode.com/svn/trunk@13357 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/core/SkPicture.cpp b/src/core/SkPicture.cpp
index ca1b6fa..e226c26 100644
--- a/src/core/SkPicture.cpp
+++ b/src/core/SkPicture.cpp
@@ -265,6 +265,7 @@
#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) {
@@ -273,8 +274,8 @@
// Check magic bytes.
char magic[sizeof(kMagic)];
- stream->read(magic, sizeof(kMagic));
- if (0 != memcmp(magic, kMagic, sizeof(kMagic))) {
+ if (!stream->read(magic, sizeof(kMagic)) ||
+ (0 != memcmp(magic, kMagic, sizeof(kMagic)))) {
return false;
}
@@ -293,6 +294,30 @@
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;
+ }
+
+ if (PICTURE_VERSION != info.fVersion) {
+ return false;
+ }
+
+ if (pInfo != NULL) {
+ *pInfo = info;
+ }
+ return true;
+}
+
SkPicture::SkPicture(SkPicturePlayback* playback, int width, int height)
: fPlayback(playback)
, fRecord(NULL)
@@ -320,6 +345,46 @@
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;
@@ -327,24 +392,9 @@
playback = SkNEW_ARGS(SkPicturePlayback, (*fRecord));
}
- 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));
+ char header[kHeaderSize];
+ createHeader(&header);
+ stream->write(header, kHeaderSize);
if (playback) {
stream->writeBool(true);
playback->serialize(stream, encoder);
@@ -357,6 +407,28 @@
}
}
+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();
diff --git a/src/core/SkPicturePlayback.cpp b/src/core/SkPicturePlayback.cpp
index e71a17f..8b8c6b0 100644
--- a/src/core/SkPicturePlayback.cpp
+++ b/src/core/SkPicturePlayback.cpp
@@ -431,6 +431,22 @@
stream->write32(PICT_EOF_TAG);
}
+void SkPicturePlayback::flatten(SkWriteBuffer& buffer) const {
+ writeTagSize(buffer, PICT_READER_TAG, fOpData->size());
+ buffer.writeByteArray(fOpData->bytes(), fOpData->size());
+
+ if (fPictureCount > 0) {
+ writeTagSize(buffer, PICT_PICTURE_TAG, fPictureCount);
+ for (int i = 0; i < fPictureCount; i++) {
+ fPictureRefs[i]->flatten(buffer);
+ }
+ }
+
+ // Write this picture playback's data into a writebuffer
+ this->flattenToBuffer(buffer);
+ buffer.write32(PICT_EOF_TAG);
+}
+
///////////////////////////////////////////////////////////////////////////////
/**
@@ -593,6 +609,15 @@
return playback.detach();
}
+SkPicturePlayback* SkPicturePlayback::CreateFromBuffer(SkReadBuffer& buffer) {
+ SkAutoTDelete<SkPicturePlayback> playback(SkNEW(SkPicturePlayback));
+
+ if (!playback->parseBuffer(buffer)) {
+ return NULL;
+ }
+ return playback.detach();
+}
+
bool SkPicturePlayback::parseStream(SkStream* stream, const SkPictInfo& info,
SkPicture::InstallPixelRefProc proc) {
for (;;) {
@@ -609,6 +634,21 @@
return true;
}
+bool SkPicturePlayback::parseBuffer(SkReadBuffer& buffer) {
+ for (;;) {
+ uint32_t tag = buffer.readUInt();
+ if (PICT_EOF_TAG == tag) {
+ break;
+ }
+
+ uint32_t size = buffer.readUInt();
+ if (!this->parseBufferTag(buffer, tag, size)) {
+ return false; // we're invalid
+ }
+ }
+ return true;
+}
+
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/SkPicturePlayback.h b/src/core/SkPicturePlayback.h
index efa6722..909488b 100644
--- a/src/core/SkPicturePlayback.h
+++ b/src/core/SkPicturePlayback.h
@@ -64,12 +64,14 @@
explicit SkPicturePlayback(const SkPictureRecord& record, bool deepCopy = false);
static SkPicturePlayback* CreateFromStream(SkStream*, const SkPictInfo&,
SkPicture::InstallPixelRefProc);
+ static SkPicturePlayback* CreateFromBuffer(SkReadBuffer&);
virtual ~SkPicturePlayback();
void draw(SkCanvas& canvas, SkDrawPictureCallback*);
void serialize(SkWStream*, SkPicture::EncodeBitmap) const;
+ void flatten(SkWriteBuffer&) const;
void dumpSize() const;
@@ -84,6 +86,7 @@
protected:
bool parseStream(SkStream*, const SkPictInfo&,
SkPicture::InstallPixelRefProc);
+ bool parseBuffer(SkReadBuffer& buffer);
#ifdef SK_DEVELOPER
virtual bool preDraw(int opIndex, int type);
virtual void postDraw(int opIndex);
diff --git a/src/effects/SkPictureImageFilter.cpp b/src/effects/SkPictureImageFilter.cpp
index c78b249..6e76231 100644
--- a/src/effects/SkPictureImageFilter.cpp
+++ b/src/effects/SkPictureImageFilter.cpp
@@ -34,13 +34,27 @@
SkPictureImageFilter::SkPictureImageFilter(SkReadBuffer& buffer)
: INHERITED(0, buffer),
fPicture(NULL) {
- // FIXME: unflatten picture here.
+#ifdef SK_ALLOW_PICTUREIMAGEFILTER_SERIALIZATION
+ if (buffer.readBool()) {
+ fPicture = SkPicture::CreateFromBuffer(buffer);
+ }
+#else
+ buffer.readBool();
+#endif
buffer.readRect(&fRect);
}
void SkPictureImageFilter::flatten(SkWriteBuffer& buffer) const {
this->INHERITED::flatten(buffer);
- // FIXME: flatten picture here.
+#ifdef SK_ALLOW_PICTUREIMAGEFILTER_SERIALIZATION
+ bool hasPicture = (fPicture != NULL);
+ buffer.writeBool(hasPicture);
+ if (hasPicture) {
+ fPicture->flatten(buffer);
+ }
+#else
+ buffer.writeBool(false);
+#endif
buffer.writeRect(fRect);
}
diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp
index 9b0a0b2..a567c41 100644
--- a/src/image/SkImage.cpp
+++ b/src/image/SkImage.cpp
@@ -55,7 +55,7 @@
if (NULL == bitmap) {
return false;
}
-
+
SkIRect bounds = SkIRect::MakeWH(this->width(), this->height());
// trim against the bitmap, if its already been allocated
@@ -126,7 +126,7 @@
srcR.set(subset);
dstR = srcR;
dstR.offset(-dstR.left(), -dstR.top());
-
+
SkCanvas canvas(*bitmap);
SkPaint paint;
@@ -136,4 +136,3 @@
const_cast<SkImage_Base*>(this)->onDrawRectToRect(&canvas, &srcR, dstR, NULL);
return true;
}
-