| Index: src/fonts/SkFontMgr_indirect.cpp
|
| diff --git a/src/fonts/SkFontMgr_indirect.cpp b/src/fonts/SkFontMgr_indirect.cpp
|
| index 5615a78c211eb33cddf8a8abd537bd38640cfbf4..172d5412a6b934edc89d3c1ce8d53508a48f24ad 100644
|
| --- a/src/fonts/SkFontMgr_indirect.cpp
|
| +++ b/src/fonts/SkFontMgr_indirect.cpp
|
| @@ -25,9 +25,9 @@ public:
|
| : fOwner(SkRef(owner)), fFamilyIndex(familyIndex), fData(data)
|
| { }
|
|
|
| - int count() SK_OVERRIDE { return fData->count(); }
|
| + int count() override { return fData->count(); }
|
|
|
| - void getStyle(int index, SkFontStyle* fs, SkString* style) SK_OVERRIDE {
|
| + void getStyle(int index, SkFontStyle* fs, SkString* style) override {
|
| if (fs) {
|
| *fs = fData->at(index).fFontStyle;
|
| }
|
| @@ -37,11 +37,11 @@ public:
|
| }
|
| }
|
|
|
| - SkTypeface* createTypeface(int index) SK_OVERRIDE {
|
| + SkTypeface* createTypeface(int index) override {
|
| return fOwner->createTypefaceFromFontId(fData->at(index));
|
| }
|
|
|
| - SkTypeface* matchStyle(const SkFontStyle& pattern) SK_OVERRIDE {
|
| + SkTypeface* matchStyle(const SkFontStyle& pattern) override {
|
| if (fFamilyIndex >= 0) {
|
| SkFontIdentity id = fOwner->fProxy->matchIndexStyle(fFamilyIndex, pattern);
|
| return fOwner->createTypefaceFromFontId(id);
|
|
|