diff options
author | 2015-03-25 18:17:31 -0700 | |
---|---|---|
committer | 2015-03-25 18:17:32 -0700 | |
commit | 36352bf5e38f45a70ee4f4fc132a38048d38206d (patch) | |
tree | 24f662dbc4bceca8f2e59521ab41ad2c1cf89ca6 /src/ports/SkFontConfigInterface_direct.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 'src/ports/SkFontConfigInterface_direct.cpp')
-rw-r--r-- | src/ports/SkFontConfigInterface_direct.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ports/SkFontConfigInterface_direct.cpp b/src/ports/SkFontConfigInterface_direct.cpp index 0f2d882ca8..5d4aca905b 100644 --- a/src/ports/SkFontConfigInterface_direct.cpp +++ b/src/ports/SkFontConfigInterface_direct.cpp @@ -111,14 +111,14 @@ public: SkTypeface::Style requested, FontIdentity* outFontIdentifier, SkString* outFamilyName, - SkTypeface::Style* outStyle) SK_OVERRIDE; - SkStreamAsset* openStream(const FontIdentity&) SK_OVERRIDE; + SkTypeface::Style* outStyle) override; + SkStreamAsset* openStream(const FontIdentity&) override; // new APIs - SkDataTable* getFamilyNames() SK_OVERRIDE; + SkDataTable* getFamilyNames() override; virtual bool matchFamilySet(const char inFamilyName[], SkString* outFamilyName, - SkTArray<FontIdentity>*) SK_OVERRIDE; + SkTArray<FontIdentity>*) override; private: SkMutex mutex_; |