diff options
| author |  Mike Reed <reed@google.com> | 2017-12-15 20:42:14 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-12-15 20:42:21 +0000 |
| commit | a091a4bd78011a266e7292a9b721750ff62423d3 (patch) | |
| tree | e4cc7e14e7aa35a9b315690c469f715579acc643 /src/image/SkImage.cpp | |
| parent | f09e35eb59e43dedc329d3d15065b3e2735b7936 (diff) | |
Revert "Revert "hide SkImageDeserializer""
This reverts commit 36d71787929002511edc37663b56d5909d2600cf.
Reason for revert: google3 updated
Original change's description:
> Revert "hide SkImageDeserializer"
>
> This reverts commit 834fb8ed906984739aee6b61417afddb9c6e469c.
>
> Reason for revert: broke google3
>
> Original change's description:
> > hide SkImageDeserializer
> >
> > Bug: skia:
> > Change-Id: I1cd4e8c626628a3e6426afd7d6bae628d58989c3
> > Reviewed-on: https://skia-review.googlesource.com/85743
> > Reviewed-by: Mike Reed <reed@google.com>
> > Commit-Queue: Mike Reed <reed@google.com>
>
> TBR=reed@google.com,reed@chromium.org
>
> Change-Id: I00679c8651817af1777785da6c8dac9411a2a7c2
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:
> Reviewed-on: https://skia-review.googlesource.com/85880
> Reviewed-by: Mike Reed <reed@google.com>
> Commit-Queue: Mike Reed <reed@google.com>
TBR=reed@google.com,reed@chromium.org
Change-Id: Icce36dfb9570ccf79f165076c59aa4de49fb6040
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/86100
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'src/image/SkImage.cpp')
| -rw-r--r-- | src/image/SkImage.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp index 01aceab773..31104d2548 100644 --- a/src/image/SkImage.cpp +++ b/src/image/SkImage.cpp @@ -405,6 +405,7 @@ sk_sp<SkImage> MakeTextureFromMipMap(GrContext*, const SkImageInfo&, const GrMip } /////////////////////////////////////////////////////////////////////////////////////////////////// +#ifdef SK_SUPPORT_LEGACY_IMAGEDESERIALIZER #include "SkImageDeserializer.h" sk_sp<SkImage> SkImageDeserializer::makeFromData(SkData* data, const SkIRect* subset) { @@ -414,6 +415,7 @@ sk_sp<SkImage> SkImageDeserializer::makeFromMemory(const void* data, size_t leng const SkIRect* subset) { return SkImage::MakeFromEncoded(SkData::MakeWithCopy(data, length), subset); } +#endif /////////////////////////////////////////////////////////////////////////////////////////////////// |