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/SkScalerContext_win_dw.h | |
| 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/SkScalerContext_win_dw.h')
| -rw-r--r-- | src/ports/SkScalerContext_win_dw.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/ports/SkScalerContext_win_dw.h b/src/ports/SkScalerContext_win_dw.h index defd4134c5..98c4910b27 100644 --- a/src/ports/SkScalerContext_win_dw.h +++ b/src/ports/SkScalerContext_win_dw.h @@ -15,7 +15,7 @@ #include <dwrite.h> #if SK_HAS_DWRITE_2_H -# include <dwrite_2.h> +#include <dwrite_2.h> #endif class SkGlyph; @@ -76,10 +76,9 @@ private: DWRITE_TEXTURE_TYPE fTextureType; DWRITE_MEASURING_MODE fMeasuringMode; #if SK_HAS_DWRITE_2_H - DWRITE_TEXT_ANTIALIAS_MODE fAntiAliasMode; - DWRITE_GRID_FIT_MODE fGridFitMode; -#endif + SkTScopedComPtr<IDWriteFactory2> fFactory2; bool fIsColorFont; +#endif }; #endif |