diff options
author | robertphillips <robertphillips@google.com> | 2014-12-09 05:35:07 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-12-09 05:35:07 -0800 |
commit | c0708cb7bcc22a6ad14fc3c2198d8e00d71c6754 (patch) | |
tree | 48e23acfa8e27ee9755058f22fbceaf080c407fe /src/core/SkPictureData.h | |
parent | 8b7b9c2e804b54a8301363091f418cfeda719fe3 (diff) |
Revert of Replace EncodeBitmap with an interface. (patchset #11 id:190001 of https://codereview.chromium.org/784643002/)
Reason for revert:
Compilation is failing on some bots
Original issue's description:
> Replace EncodeBitmap with an interface.
>
> Gives more flexibility to the caller to decide whether to use the
> encoded data returned by refEncodedData().
>
> Provides an implementation that supports the old version of
> SkPicture::serialize().
>
> TODO: Update Chrome, so we can remove SK_LEGACY_ENCODE_BITMAP entirely
>
> BUG=skia:3190
>
> Committed: https://skia.googlesource.com/skia/+/0c4aba6edb9900c597359dfa49d3ce4a41bc5dd1
TBR=reed@google.com,scroggo@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:3190
Review URL: https://codereview.chromium.org/787833002
Diffstat (limited to 'src/core/SkPictureData.h')
-rw-r--r-- | src/core/SkPictureData.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/core/SkPictureData.h b/src/core/SkPictureData.h index ab78f8a313..667880675b 100644 --- a/src/core/SkPictureData.h +++ b/src/core/SkPictureData.h @@ -15,7 +15,6 @@ class SkData; class SkPictureRecord; -class SkPixelSerializer; class SkReader32; class SkStream; class SkWStream; @@ -65,7 +64,7 @@ public: virtual ~SkPictureData(); - void serialize(SkWStream*, SkPixelSerializer*) const; + void serialize(SkWStream*, SkPicture::EncodeBitmap) const; void flatten(SkWriteBuffer&) const; bool containsBitmaps() const; |