| Index: src/ports/SkFontConfigInterface_direct.cpp
|
| diff --git a/src/ports/SkFontConfigInterface_direct.cpp b/src/ports/SkFontConfigInterface_direct.cpp
|
| index 0f2d882ca850919619e93de1168a283164afc971..5d4aca905b1a91c091314c1e0f53f7bc1ee639f0 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_;
|
|
|