diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/ports/SkFontHost_mac.cpp | 17 | ||||
| -rwxr-xr-x | src/ports/SkFontHost_win.cpp | 7 | ||||
| -rw-r--r-- | src/ports/SkFontHost_win_dw.cpp | 6 |
3 files changed, 28 insertions, 2 deletions
diff --git a/src/ports/SkFontHost_mac.cpp b/src/ports/SkFontHost_mac.cpp index d7bd118d00..4f1c44dcdb 100755 --- a/src/ports/SkFontHost_mac.cpp +++ b/src/ports/SkFontHost_mac.cpp @@ -1832,8 +1832,21 @@ SkScalerContext* SkTypeface_Mac::onCreateScalerContext(const SkDescriptor* desc) } void SkTypeface_Mac::onFilterRec(SkScalerContextRec* rec) const { - unsigned flagsWeDontSupport = SkScalerContext::kDevKernText_Flag | - SkScalerContext::kAutohinting_Flag; + if (rec->fFlags & SkScalerContext::kLCD_BGROrder_Flag || + rec->fFlags & SkScalerContext::kLCD_Vertical_Flag) + { + rec->fMaskFormat = SkMask::kA8_Format; + // Render the glyphs as close as possible to what was requested. + // The above turns off subpixel rendering, but the user requested it. + // Normal hinting will cause the A8 masks to be generated from CoreGraphics subpixel masks. + // See comments below for more details. + rec->setHinting(SkPaint::kNormal_Hinting); + } + + unsigned flagsWeDontSupport = SkScalerContext::kDevKernText_Flag | + SkScalerContext::kAutohinting_Flag | + SkScalerContext::kLCD_BGROrder_Flag | + SkScalerContext::kLCD_Vertical_Flag; rec->fFlags &= ~flagsWeDontSupport; diff --git a/src/ports/SkFontHost_win.cpp b/src/ports/SkFontHost_win.cpp index d1c59b3223..4d484d7f79 100755 --- a/src/ports/SkFontHost_win.cpp +++ b/src/ports/SkFontHost_win.cpp @@ -1639,6 +1639,13 @@ SkTypeface* SkFontHost::CreateTypefaceFromFile(const char path[]) { } void LogFontTypeface::onFilterRec(SkScalerContextRec* rec) const { + if (rec->fFlags & SkScalerContext::kLCD_BGROrder_Flag || + rec->fFlags & SkScalerContext::kLCD_Vertical_Flag) + { + rec->fMaskFormat = SkMask::kA8_Format; + rec->fFlags |= SkScalerContext::kGenA8FromLCD_Flag; + } + unsigned flagsWeDontSupport = SkScalerContext::kDevKernText_Flag | SkScalerContext::kAutohinting_Flag | SkScalerContext::kEmbeddedBitmapText_Flag | diff --git a/src/ports/SkFontHost_win_dw.cpp b/src/ports/SkFontHost_win_dw.cpp index 84319c084a..29fa09857b 100644 --- a/src/ports/SkFontHost_win_dw.cpp +++ b/src/ports/SkFontHost_win_dw.cpp @@ -1258,6 +1258,12 @@ SkTypeface* SkFontHost::CreateTypefaceFromFile(const char path[]) { } void DWriteFontTypeface::onFilterRec(SkScalerContext::Rec* rec) const { + if (rec->fFlags & SkScalerContext::kLCD_BGROrder_Flag || + rec->fFlags & SkScalerContext::kLCD_Vertical_Flag) + { + rec->fMaskFormat = SkMask::kA8_Format; + } + unsigned flagsWeDontSupport = SkScalerContext::kDevKernText_Flag | SkScalerContext::kAutohinting_Flag | SkScalerContext::kEmbeddedBitmapText_Flag | |