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/glyph_pos.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/glyph_pos.cpp')
-rw-r--r-- | gm/glyph_pos.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gm/glyph_pos.cpp b/gm/glyph_pos.cpp index 3f1ea35e0a..0da59ac6f9 100644 --- a/gm/glyph_pos.cpp +++ b/gm/glyph_pos.cpp @@ -28,7 +28,7 @@ public: protected: - SkString onShortName() SK_OVERRIDE { + SkString onShortName() override { SkString str("glyph_pos"); if (fStrokeWidth == 0.0f) { str.append("_h"); // h == Hairline. @@ -45,9 +45,9 @@ protected: return str; } - SkISize onISize() SK_OVERRIDE { return SkISize::Make(800, 600); } + SkISize onISize() override { return SkISize::Make(800, 600); } - void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) override { if (!fProp) { fProp.reset(sk_tool_utils::create_portable_typeface("Helvetica", SkTypeface::kNormal)); } |