diff options
Diffstat (limited to 'src/ports/SkFontHost_mac.cpp')
| -rw-r--r-- | src/ports/SkFontHost_mac.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/ports/SkFontHost_mac.cpp b/src/ports/SkFontHost_mac.cpp index 8d4a3f8cfc..ec35707dd1 100644 --- a/src/ports/SkFontHost_mac.cpp +++ b/src/ports/SkFontHost_mac.cpp @@ -473,8 +473,7 @@ protected: int onGetTableTags(SkFontTableTag tags[]) const override; virtual size_t onGetTableData(SkFontTableTag, size_t offset, size_t length, void* data) const override; - SkScalerContext* onCreateScalerContext(const SkScalerContextEffects&, - const SkDescriptor*) const override; + SkScalerContext* onCreateScalerContext(const SkDescriptor*) const override; void onFilterRec(SkScalerContextRec*) const override; void onGetFontDescriptor(SkFontDescriptor*, bool*) const override; virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics( @@ -630,7 +629,7 @@ struct GlyphRect { class SkScalerContext_Mac : public SkScalerContext { public: - SkScalerContext_Mac(SkTypeface_Mac*, const SkScalerContextEffects&, const SkDescriptor*); + SkScalerContext_Mac(SkTypeface_Mac*, const SkDescriptor*); protected: unsigned generateGlyphCount(void) override; @@ -739,9 +738,8 @@ static CTFontRef ctfont_create_exact_copy(CTFontRef baseFont, CGFloat textSize, } SkScalerContext_Mac::SkScalerContext_Mac(SkTypeface_Mac* typeface, - const SkScalerContextEffects& effects, const SkDescriptor* desc) - : INHERITED(typeface, effects, desc) + : INHERITED(typeface, desc) , fFBoundingBoxes() , fFBoundingBoxesGlyphOffset(0) , fGeneratedFBoundingBoxes(false) @@ -1939,9 +1937,8 @@ size_t SkTypeface_Mac::onGetTableData(SkFontTableTag tag, size_t offset, return length; } -SkScalerContext* SkTypeface_Mac::onCreateScalerContext(const SkScalerContextEffects& effects, - const SkDescriptor* desc) const { - return new SkScalerContext_Mac(const_cast<SkTypeface_Mac*>(this), effects, desc); +SkScalerContext* SkTypeface_Mac::onCreateScalerContext(const SkDescriptor* desc) const { + return new SkScalerContext_Mac(const_cast<SkTypeface_Mac*>(this), desc); } void SkTypeface_Mac::onFilterRec(SkScalerContextRec* rec) const { |