Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(58)

Unified Diff: src/images/SkImageDecoder_libjpeg.cpp

Issue 1037793002: C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: git cl web Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/images/SkImageDecoder_libico.cpp ('k') | src/images/SkImageDecoder_libpng.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/images/SkImageDecoder_libjpeg.cpp
diff --git a/src/images/SkImageDecoder_libjpeg.cpp b/src/images/SkImageDecoder_libjpeg.cpp
index 5eb827122f29e322cb7d20be8b35dcc841dd90d9..14df6e38b223c919ed739dcaf497a65591eba4b6 100644
--- a/src/images/SkImageDecoder_libjpeg.cpp
+++ b/src/images/SkImageDecoder_libjpeg.cpp
@@ -232,19 +232,19 @@ public:
}
#endif
- Format getFormat() const SK_OVERRIDE {
+ Format getFormat() const override {
return kJPEG_Format;
}
protected:
#ifdef SK_BUILD_FOR_ANDROID
- bool onBuildTileIndex(SkStreamRewindable *stream, int *width, int *height) SK_OVERRIDE;
- bool onDecodeSubset(SkBitmap* bitmap, const SkIRect& rect) SK_OVERRIDE;
+ bool onBuildTileIndex(SkStreamRewindable *stream, int *width, int *height) override;
+ bool onDecodeSubset(SkBitmap* bitmap, const SkIRect& rect) override;
#endif
- Result onDecode(SkStream* stream, SkBitmap* bm, Mode) SK_OVERRIDE;
+ Result onDecode(SkStream* stream, SkBitmap* bm, Mode) override;
virtual bool onDecodeYUV8Planes(SkStream* stream, SkISize componentSizes[3],
void* planes[3], size_t rowBytes[3],
- SkYUVColorSpace* colorSpace) SK_OVERRIDE;
+ SkYUVColorSpace* colorSpace) override;
private:
#ifdef SK_BUILD_FOR_ANDROID
« no previous file with comments | « src/images/SkImageDecoder_libico.cpp ('k') | src/images/SkImageDecoder_libpng.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698