diff options
| author |  mtklein <mtklein@chromium.org> | 2015-03-25 18:17:31 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-03-25 18:17:32 -0700 |
| commit | 36352bf5e38f45a70ee4f4fc132a38048d38206d (patch) | |
| tree | 24f662dbc4bceca8f2e59521ab41ad2c1cf89ca6 /src/codec/SkCodec_libpng.h | |
| parent | 02fd592c8d190058652bb715fb34feb7a72992e5 (diff) | |
C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla}
NOPRESUBMIT=true
BUG=skia:
DOCS_PREVIEW= https://skia.org/?cl=1037793002
Review URL: https://codereview.chromium.org/1037793002
Diffstat (limited to 'src/codec/SkCodec_libpng.h')
| -rw-r--r-- | src/codec/SkCodec_libpng.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/codec/SkCodec_libpng.h b/src/codec/SkCodec_libpng.h index fa7b39d82f..3afaa39bf4 100644 --- a/src/codec/SkCodec_libpng.h +++ b/src/codec/SkCodec_libpng.h @@ -26,10 +26,10 @@ public: static bool IsPng(SkStream*); protected: Result onGetPixels(const SkImageInfo&, void*, size_t, const Options&, SkPMColor*, int*) - SK_OVERRIDE; - SkEncodedFormat onGetEncodedFormat() const SK_OVERRIDE { return kPNG_SkEncodedFormat; } - SkScanlineDecoder* onGetScanlineDecoder(const SkImageInfo& dstInfo) SK_OVERRIDE; - bool onReallyHasAlpha() const SK_OVERRIDE { return fReallyHasAlpha; } + override; + SkEncodedFormat onGetEncodedFormat() const override { return kPNG_SkEncodedFormat; } + SkScanlineDecoder* onGetScanlineDecoder(const SkImageInfo& dstInfo) override; + bool onReallyHasAlpha() const override { return fReallyHasAlpha; } private: png_structp fPng_ptr; png_infop fInfo_ptr; |