diff options
| author |  bungeman <bungeman@google.com> | 2016-06-16 14:41:53 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-06-16 14:41:53 -0700 |
| commit | 73c7c3c2346033e0b5df123f1a6b488015443a55 (patch) | |
| tree | 0b67bffde89371234b36122ccbdb378614c29633 /src/ports/SkTypeface_win_dw.cpp | |
| parent | 74959a1471cd3b20e2dd79fc0c685e7205a25cd9 (diff) | |
Revert of Support pixel antialising in DirectWrite. (patchset #4 id:60001 of https://codereview.chromium.org/2065833002/ )
Reason for revert:
Moving to the new glyph run analysis changes things anyway, and the Chromium Win 10 bots are having issues with this. Revert until I have time to make the suppression wider.
Original issue's description:
> Support pixel antialising in DirectWrite.
>
> DirectWrite2 supports pixel antialiasing and rendering without hinting.
>
> BUG=skia:5416
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2065833002
>
> TBR=reed
> Will move SkTScopedComPtr into src.
>
> Committed: https://skia.googlesource.com/skia/+/bd770d619553a88eeaa64ff29082f62db5c9b4d2
TBR=reed@google.com,mtklein@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:5416
Review-Url: https://codereview.chromium.org/2075913002
Diffstat (limited to 'src/ports/SkTypeface_win_dw.cpp')
| -rw-r--r-- | src/ports/SkTypeface_win_dw.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/ports/SkTypeface_win_dw.cpp b/src/ports/SkTypeface_win_dw.cpp index 78e3cac558..a12438c88f 100644 --- a/src/ports/SkTypeface_win_dw.cpp +++ b/src/ports/SkTypeface_win_dw.cpp @@ -252,7 +252,6 @@ SkScalerContext* DWriteFontTypeface::onCreateScalerContext(const SkScalerContext void DWriteFontTypeface::onFilterRec(SkScalerContext::Rec* rec) const { if (rec->fFlags & SkScalerContext::kLCD_Vertical_Flag) { rec->fMaskFormat = SkMask::kA8_Format; - rec->fFlags |= SkScalerContext::kGenA8FromLCD_Flag; } unsigned flagsWeDontSupport = SkScalerContext::kVertical_Flag | @@ -263,10 +262,8 @@ void DWriteFontTypeface::onFilterRec(SkScalerContext::Rec* rec) const { rec->fFlags &= ~flagsWeDontSupport; SkPaint::Hinting h = rec->getHinting(); - // DirectWrite2 allows for hinting to be turned off. Force everything else to normal. - if (h != SkPaint::kNo_Hinting || !fFactory2 || !fDWriteFontFace2) { - h = SkPaint::kNormal_Hinting; - } + // DirectWrite does not provide for hinting hints. + h = SkPaint::kSlight_Hinting; rec->setHinting(h); #if defined(SK_FONT_HOST_USE_SYSTEM_SETTINGS) |