diff options
Diffstat (limited to 'gm/etc1bitmap.cpp')
-rw-r--r-- | gm/etc1bitmap.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gm/etc1bitmap.cpp b/gm/etc1bitmap.cpp index e93ed1d7e8..c66f7b23b9 100644 --- a/gm/etc1bitmap.cpp +++ b/gm/etc1bitmap.cpp @@ -81,19 +81,19 @@ public: virtual ~ETC1BitmapGM() { } protected: - SkString onShortName() SK_OVERRIDE { + SkString onShortName() override { SkString str = SkString("etc1bitmap_"); str.append(this->fileExtension()); return str; } - SkISize onISize() SK_OVERRIDE { + SkISize onISize() override { return SkISize::Make(128, 128); } virtual SkString fileExtension() const = 0; - void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) override { SkBitmap bm; SkString filename = GetResourcePath("mandrill_128."); filename.append(this->fileExtension()); @@ -123,7 +123,7 @@ public: protected: - SkString fileExtension() const SK_OVERRIDE { return SkString("pkm"); } + SkString fileExtension() const override { return SkString("pkm"); } private: typedef ETC1BitmapGM INHERITED; @@ -137,7 +137,7 @@ public: protected: - SkString fileExtension() const SK_OVERRIDE { return SkString("ktx"); } + SkString fileExtension() const override { return SkString("ktx"); } private: typedef ETC1BitmapGM INHERITED; @@ -151,7 +151,7 @@ public: protected: - SkString fileExtension() const SK_OVERRIDE { return SkString("r11.ktx"); } + SkString fileExtension() const override { return SkString("r11.ktx"); } private: typedef ETC1BitmapGM INHERITED; @@ -170,15 +170,15 @@ public: virtual ~ETC1Bitmap_NPOT_GM() { } protected: - SkString onShortName() SK_OVERRIDE { + SkString onShortName() override { return SkString("etc1bitmap_npot"); } - SkISize onISize() SK_OVERRIDE { + SkISize onISize() override { return SkISize::Make(124, 124); } - void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) override { SkBitmap bm; SkString pkmFilename = GetResourcePath("mandrill_128.pkm"); SkAutoDataUnref fileData(SkData::NewFromFileName(pkmFilename.c_str())); |