diff options
author | 2015-03-25 18:17:31 -0700 | |
---|---|---|
committer | 2015-03-25 18:17:32 -0700 | |
commit | 36352bf5e38f45a70ee4f4fc132a38048d38206d (patch) | |
tree | 24f662dbc4bceca8f2e59521ab41ad2c1cf89ca6 /src/codec/SkCodec_libpng.cpp | |
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.cpp')
-rw-r--r-- | src/codec/SkCodec_libpng.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/codec/SkCodec_libpng.cpp b/src/codec/SkCodec_libpng.cpp index 60923356c1..8c0b624b8d 100644 --- a/src/codec/SkCodec_libpng.cpp +++ b/src/codec/SkCodec_libpng.cpp @@ -503,7 +503,7 @@ public: fSrcRow = static_cast<uint8_t*>(fStorage.get()); } - SkImageGenerator::Result onGetScanlines(void* dst, int count, size_t rowBytes) SK_OVERRIDE { + SkImageGenerator::Result onGetScanlines(void* dst, int count, size_t rowBytes) override { if (setjmp(png_jmpbuf(fCodec->fPng_ptr))) { SkDebugf("setjmp long jump!\n"); return SkImageGenerator::kInvalidInput; @@ -518,7 +518,7 @@ public: return SkImageGenerator::kSuccess; } - SkImageGenerator::Result onSkipScanlines(int count) SK_OVERRIDE { + SkImageGenerator::Result onSkipScanlines(int count) override { // FIXME: Could we use the return value of setjmp to specify the type of // error? if (setjmp(png_jmpbuf(fCodec->fPng_ptr))) { @@ -530,11 +530,11 @@ public: return SkImageGenerator::kSuccess; } - void onFinish() SK_OVERRIDE { + void onFinish() override { fCodec->finish(); } - bool onReallyHasAlpha() const SK_OVERRIDE { return fHasAlpha; } + bool onReallyHasAlpha() const override { return fHasAlpha; } private: SkPngCodec* fCodec; // Unowned. |