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

Unified Diff: src/images/SkDecodingImageGenerator.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/image/SkSurface_Raster.cpp ('k') | src/images/SkImageDecoder_astc.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/images/SkDecodingImageGenerator.cpp
diff --git a/src/images/SkDecodingImageGenerator.cpp b/src/images/SkDecodingImageGenerator.cpp
index 337a96407b86b675ff227319b9ac98ac4d1c9c57..329730ab3e6bbd67641c3a08ef5219e3a9fd00a6 100644
--- a/src/images/SkDecodingImageGenerator.cpp
+++ b/src/images/SkDecodingImageGenerator.cpp
@@ -37,18 +37,18 @@ public:
bool ditherImage);
protected:
- SkData* onRefEncodedData() SK_OVERRIDE;
+ SkData* onRefEncodedData() override;
#ifdef SK_SUPPORT_LEGACY_BOOL_ONGETINFO
- bool onGetInfo(SkImageInfo* info) SK_OVERRIDE {
+ bool onGetInfo(SkImageInfo* info) override {
*info = fInfo;
return true;
}
#endif
virtual Result onGetPixels(const SkImageInfo& info,
void* pixels, size_t rowBytes, const Options&,
- SkPMColor ctable[], int* ctableCount) SK_OVERRIDE;
+ SkPMColor ctable[], int* ctableCount) override;
virtual bool onGetYUV8Planes(SkISize sizes[3], void* planes[3], size_t rowBytes[3],
- SkYUVColorSpace* colorSpace) SK_OVERRIDE;
+ SkYUVColorSpace* colorSpace) override;
private:
typedef SkImageGenerator INHERITED;
« no previous file with comments | « src/image/SkSurface_Raster.cpp ('k') | src/images/SkImageDecoder_astc.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698