| Index: src/ports/SkTypeface_win_dw.h
|
| diff --git a/src/ports/SkTypeface_win_dw.h b/src/ports/SkTypeface_win_dw.h
|
| index 9e824e59486fcd6a8a27574b39485a9d49657574..9921aed4f76a6ed3ddc9184ac2a3081376cfa7f9 100644
|
| --- a/src/ports/SkTypeface_win_dw.h
|
| +++ b/src/ports/SkTypeface_win_dw.h
|
| @@ -84,7 +84,7 @@ public:
|
| }
|
|
|
| protected:
|
| - void weak_dispose() const SK_OVERRIDE {
|
| + void weak_dispose() const override {
|
| if (fDWriteFontCollectionLoader.get()) {
|
| HRV(fFactory->UnregisterFontCollectionLoader(fDWriteFontCollectionLoader.get()));
|
| }
|
| @@ -96,22 +96,22 @@ protected:
|
| INHERITED::weak_dispose();
|
| }
|
|
|
| - SkStreamAsset* onOpenStream(int* ttcIndex) const SK_OVERRIDE;
|
| - SkScalerContext* onCreateScalerContext(const SkDescriptor*) const SK_OVERRIDE;
|
| - void onFilterRec(SkScalerContextRec*) const SK_OVERRIDE;
|
| + SkStreamAsset* onOpenStream(int* ttcIndex) const override;
|
| + SkScalerContext* onCreateScalerContext(const SkDescriptor*) const override;
|
| + void onFilterRec(SkScalerContextRec*) const override;
|
| virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics(
|
| SkAdvancedTypefaceMetrics::PerGlyphInfo,
|
| - const uint32_t*, uint32_t) const SK_OVERRIDE;
|
| - void onGetFontDescriptor(SkFontDescriptor*, bool*) const SK_OVERRIDE;
|
| + const uint32_t*, uint32_t) const override;
|
| + void onGetFontDescriptor(SkFontDescriptor*, bool*) const override;
|
| virtual int onCharsToGlyphs(const void* chars, Encoding encoding,
|
| - uint16_t glyphs[], int glyphCount) const SK_OVERRIDE;
|
| - int onCountGlyphs() const SK_OVERRIDE;
|
| - int onGetUPEM() const SK_OVERRIDE;
|
| - void onGetFamilyName(SkString* familyName) const SK_OVERRIDE;
|
| - SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const SK_OVERRIDE;
|
| - int onGetTableTags(SkFontTableTag tags[]) const SK_OVERRIDE;
|
| + uint16_t glyphs[], int glyphCount) const override;
|
| + int onCountGlyphs() const override;
|
| + int onGetUPEM() const override;
|
| + void onGetFamilyName(SkString* familyName) const override;
|
| + SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const override;
|
| + int onGetTableTags(SkFontTableTag tags[]) const override;
|
| virtual size_t onGetTableData(SkFontTableTag, size_t offset,
|
| - size_t length, void* data) const SK_OVERRIDE;
|
| + size_t length, void* data) const override;
|
|
|
| private:
|
| typedef SkTypeface INHERITED;
|
|
|