Index: src/ports/SkFontHost_mac.cpp |
diff --git a/src/ports/SkFontHost_mac.cpp b/src/ports/SkFontHost_mac.cpp |
index 8d4a3f8cfcc0a1a39d3edd24bdcf34a1fd94fedf..ec35707dd190b40f14ecd1215e37891b43d1d840 100644 |
--- a/src/ports/SkFontHost_mac.cpp |
+++ b/src/ports/SkFontHost_mac.cpp |
@@ -473,8 +473,7 @@ |
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 @@ |
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 @@ |
} |
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 @@ |
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 { |