diff options
Diffstat (limited to 'src/ports/SkFontHost_win.cpp')
| -rw-r--r-- | src/ports/SkFontHost_win.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/ports/SkFontHost_win.cpp b/src/ports/SkFontHost_win.cpp index 395307cf04..f772d8c57e 100644 --- a/src/ports/SkFontHost_win.cpp +++ b/src/ports/SkFontHost_win.cpp @@ -257,8 +257,7 @@ public: protected: SkStreamAsset* onOpenStream(int* ttcIndex) const override; - SkScalerContext* onCreateScalerContext(const SkScalerContextEffects&, - const SkDescriptor*) const override; + SkScalerContext* onCreateScalerContext(const SkDescriptor*) const override; void onFilterRec(SkScalerContextRec*) const override; SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics( PerGlyphInfo, const uint32_t*, uint32_t) const override; @@ -534,7 +533,7 @@ const void* HDCOffscreen::draw(const SkGlyph& glyph, bool isBW, class SkScalerContext_GDI : public SkScalerContext { public: - SkScalerContext_GDI(SkTypeface*, const SkScalerContextEffects&, const SkDescriptor* desc); + SkScalerContext_GDI(SkTypeface*, const SkDescriptor* desc); virtual ~SkScalerContext_GDI(); // Returns true if the constructor was able to complete all of its @@ -605,9 +604,8 @@ static BYTE compute_quality(const SkScalerContext::Rec& rec) { } SkScalerContext_GDI::SkScalerContext_GDI(SkTypeface* rawTypeface, - const SkScalerContextEffects& effects, - const SkDescriptor* desc) - : SkScalerContext(rawTypeface, effects, desc) + const SkDescriptor* desc) + : SkScalerContext(rawTypeface, desc) , fDDC(0) , fSavefont(0) , fFont(0) @@ -2287,10 +2285,8 @@ size_t LogFontTypeface::onGetTableData(SkFontTableTag tag, size_t offset, return bufferSize == GDI_ERROR ? 0 : bufferSize; } -SkScalerContext* LogFontTypeface::onCreateScalerContext(const SkScalerContextEffects& effects, - const SkDescriptor* desc) const { - SkScalerContext_GDI* ctx = new SkScalerContext_GDI(const_cast<LogFontTypeface*>(this), - effects, desc); +SkScalerContext* LogFontTypeface::onCreateScalerContext(const SkDescriptor* desc) const { + SkScalerContext_GDI* ctx = new SkScalerContext_GDI(const_cast<LogFontTypeface*>(this), desc); if (!ctx->isValid()) { delete ctx; ctx = nullptr; |