diff options
| author |  reed <reed@google.com> | 2015-03-19 08:31:14 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-03-19 08:31:14 -0700 |
| commit | 3ef71e343bf075888fb50892350390b4dd47de24 (patch) | |
| tree | d4765ef144928600322cf21bdb41b37f05a55697 /src/ports | |
| parent | 647211f1243f2dc925588e75038be49cad7b5431 (diff) | |
guarded change to SkImageGenerator to make getInfo() const
BUG=skia:
Review URL: https://codereview.chromium.org/1017293002
Diffstat (limited to 'src/ports')
| -rw-r--r-- | src/ports/SkImageGenerator_skia.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/ports/SkImageGenerator_skia.cpp b/src/ports/SkImageGenerator_skia.cpp index 1448d57ce5..6938880357 100644 --- a/src/ports/SkImageGenerator_skia.cpp +++ b/src/ports/SkImageGenerator_skia.cpp @@ -39,7 +39,7 @@ class SkImageDecoderGenerator : public SkImageGenerator { public: SkImageDecoderGenerator(const SkImageInfo& info, SkImageDecoder* decoder, SkData* data) - : fInfo(info), fDecoder(decoder), fData(SkRef(data)) + : INHERITED(info), fInfo(info), fDecoder(decoder), fData(SkRef(data)) {} protected: @@ -47,10 +47,12 @@ protected: return SkRef(fData.get()); } +#ifdef SK_SUPPORT_LEGACY_BOOL_ONGETINFO virtual bool onGetInfo(SkImageInfo* info) SK_OVERRIDE { *info = fInfo; return true; } +#endif virtual Result onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes, const Options&, @@ -92,7 +94,9 @@ protected: SkMemoryStream stream(fData->data(), fData->size(), false); return fDecoder->decodeYUV8Planes(&stream, sizes, planes, rowBytes, colorSpace); } - + +private: + typedef SkImageGenerator INHERITED; }; SkImageGenerator* SkImageGenerator::NewFromData(SkData* data) { |