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/dftext.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/dftext.cpp')
-rwxr-xr-x | gm/dftext.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gm/dftext.cpp b/gm/dftext.cpp index f3d39e527c..314ee71389 100755 --- a/gm/dftext.cpp +++ b/gm/dftext.cpp @@ -23,7 +23,7 @@ public: } protected: - void onOnceBeforeDraw() SK_OVERRIDE { + void onOnceBeforeDraw() override { SkString filename = GetResourcePath("/Funkster.ttf"); SkAutoTDelete<SkFILEStream> stream(new SkFILEStream(filename.c_str())); if (!stream->isValid()) { @@ -34,11 +34,11 @@ protected: fTypeface = SkTypeface::CreateFromStream(stream.detach()); } - SkString onShortName() SK_OVERRIDE { + SkString onShortName() override { return SkString("dftext"); } - SkISize onISize() SK_OVERRIDE { + SkISize onISize() override { return SkISize::Make(1024, 768); } @@ -50,7 +50,7 @@ protected: canvas->translate(-px, -py); } - virtual void onDraw(SkCanvas* inputCanvas) SK_OVERRIDE { + virtual void onDraw(SkCanvas* inputCanvas) override { #ifdef SK_BUILD_FOR_ANDROID SkScalar textSizes[] = { 9.0f, 9.0f*2.0f, 9.0f*5.0f, 9.0f*2.0f*5.0f }; #else |