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 /gm/imagefilterstransformed.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 'gm/imagefilterstransformed.cpp')
| -rw-r--r-- | gm/imagefilterstransformed.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gm/imagefilterstransformed.cpp b/gm/imagefilterstransformed.cpp index 3bac0e5714..794a47167a 100644 --- a/gm/imagefilterstransformed.cpp +++ b/gm/imagefilterstransformed.cpp @@ -30,9 +30,9 @@ public: protected: - SkString onShortName() SK_OVERRIDE { return SkString("imagefilterstransformed"); } + SkString onShortName() override { return SkString("imagefilterstransformed"); } - SkISize onISize() SK_OVERRIDE { return SkISize::Make(420, 240); } + SkISize onISize() override { return SkISize::Make(420, 240); } void makeGradientCircle(int width, int height) { SkScalar x = SkIntToScalar(width / 2); @@ -53,7 +53,7 @@ protected: canvas.drawCircle(x, y, radius, paint); } - void onOnceBeforeDraw() SK_OVERRIDE { + void onOnceBeforeDraw() override { fCheckerboard.allocN32Pixels(64, 64); SkCanvas checkerboardCanvas(fCheckerboard); sk_tool_utils::draw_checkerboard(&checkerboardCanvas, 0xFFA0A0A0, 0xFF404040, 8); @@ -61,7 +61,7 @@ protected: this->makeGradientCircle(64, 64); } - void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) override { SkAutoTUnref<SkImageFilter> gradient(SkBitmapSource::Create(fGradientCircle)); SkAutoTUnref<SkImageFilter> checkerboard(SkBitmapSource::Create(fCheckerboard)); SkImageFilter* filters[] = { |