diff options
| author |  Mike Reed <reed@google.com> | 2017-03-15 23:51:22 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-15 23:51:33 +0000 |
| commit | b66fa526b882f2472d731b42cba65fe05cea4268 (patch) | |
| tree | 32dcc54fb6c44aab74c9907b9fedbc62311fca3b /src/ports/SkScalerContext_win_dw.h | |
| parent | 5eefb853c68f76fc5001bc6e8e9e5db2772ac135 (diff) | |
Revert "Support pixel antialising in DirectWrite."
This reverts commit 34db1eee20ffea6e423284bb06824653efff645d.
Reason for revert: breaks the chrome roll
E:\b\c\b\win_clang\src\third_party\skia\src\ports\SkScalerContext_win_dw.cpp(287,49): error: suggest braces around initialization of subobject [-Werror,-Wmissing-braces]
GaspRange range{bitmapPPEM, bitmapPPEM, 0};
^
{}
E:\b\c\b\win_clang\src\third_party\skia\src\ports\SkScalerContext_win_dw.cpp(287,49): error: suggest braces around initialization of subobject [-Werror,-Wmissing-braces]
GaspRange range{bitmapPPEM, bitmapPPEM, 0};
^
{}
E:\b\c\b\win_clang\src\third_party\skia\src\ports\SkScalerContext_win_dw.cpp(290,59): error: suggest braces around initialization of subobject [-Werror,-Wmissing-braces]
range = GaspRange{bitmapPPEM, bitmapPPEM, 0};
^
{}
E:\b\c\b\win_clang\src\third_party\skia\src\ports\SkScalerContext_win_dw.cpp(290,59): error: suggest braces around initialization of subobject [-Werror,-Wmissing-braces]
range = GaspRange{bitmapPPEM, bitmapPPEM, 0};
^
{}
E:\b\c\b\win_clang\src\third_party\skia\src\ports\SkScalerContext_win_dw.cpp(338,39): error: suggest braces around initialization of subobject [-Werror,-Wmissing-braces]
GaspRange range = {0, 0xFFFF, 0};
^
{}
E:\b\c\b\win_clang\src\third_party\skia\src\ports\SkScalerContext_win_dw.cpp(338,39): error: suggest braces around initialization of subobject [-Werror,-Wmissing-braces]
GaspRange range = {0, 0xFFFF, 0};
^
{}
Original change's description:
> Support pixel antialising in DirectWrite.
>
> DirectWrite2 supports pixel antialiasing and rendering without hinting.
>
> BUG=skia:5416
>
> Change-Id: I215245b20dd403669dbccd37e34cb2fcd5e06431
> Reviewed-on: https://skia-review.googlesource.com/9145
> Reviewed-by: Mike Reed <reed@google.com>
> Commit-Queue: Ben Wagner <bungeman@google.com>
>
TBR=mtklein@google.com,bungeman@google.com,reed@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:5416
Change-Id: Ic5f09abc3be8dd85d213a007780b3fe15fc11d92
Reviewed-on: https://skia-review.googlesource.com/9747
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'src/ports/SkScalerContext_win_dw.h')
| -rw-r--r-- | src/ports/SkScalerContext_win_dw.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/ports/SkScalerContext_win_dw.h b/src/ports/SkScalerContext_win_dw.h index f186ea52dc..e13e01a61b 100644 --- a/src/ports/SkScalerContext_win_dw.h +++ b/src/ports/SkScalerContext_win_dw.h @@ -76,8 +76,7 @@ private: DWRITE_RENDERING_MODE fRenderingMode; DWRITE_TEXTURE_TYPE fTextureType; DWRITE_MEASURING_MODE fMeasuringMode; - DWRITE_TEXT_ANTIALIAS_MODE fAntiAliasMode; - DWRITE_GRID_FIT_MODE fGridFitMode; + SkTScopedComPtr<IDWriteFactory2> fFactory2; bool fIsColorFont; }; |