diff options
| author |  Ben Wagner <bungeman@google.com> | 2017-03-01 16:08:00 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-01 22:11:25 +0000 |
| commit | e0c9e00cd5ed17a45a988b8b57fa9c09f3574921 (patch) | |
| tree | 0cf1e54ae42f4bd6397b3dd280f240f05967ad95 /src/ports/SkScalerContext_win_dw.h | |
| parent | 2a098d09edfb7f02139a9537df6f1c0ac514fd74 (diff) | |
Remove SK_HAS_DWRITE_X defines.
While developing DirectWrite it was ncessary to support building with
older Windows SDKs which may not have certain headers. Now that the
minimum required Windows SDK is 8.1 (0x0603) we can remove these
difficult to use macros to simplify future development.
Change-Id: Ia780466b7c9b86198116c5974c43363f49a0ebac
Reviewed-on: https://skia-review.googlesource.com/9124
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
Diffstat (limited to 'src/ports/SkScalerContext_win_dw.h')
| -rw-r--r-- | src/ports/SkScalerContext_win_dw.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/ports/SkScalerContext_win_dw.h b/src/ports/SkScalerContext_win_dw.h index 7b45c320ca..e13e01a61b 100644 --- a/src/ports/SkScalerContext_win_dw.h +++ b/src/ports/SkScalerContext_win_dw.h @@ -14,9 +14,7 @@ #include "SkTypes.h" #include <dwrite.h> -#if SK_HAS_DWRITE_2_H #include <dwrite_2.h> -#endif class SkGlyph; class SkDescriptor; @@ -53,11 +51,9 @@ private: return static_cast<DWriteFontTypeface*>(this->getTypeface()); } -#if SK_HAS_DWRITE_2_H bool getColorGlyphRun(const SkGlyph& glyph, IDWriteColorGlyphRunEnumerator** colorGlyph); void generateColorGlyphImage(const SkGlyph& glyph); -#endif SkTDArray<uint8_t> fBits; /** The total matrix without the text height scale. */ @@ -80,10 +76,8 @@ private: DWRITE_RENDERING_MODE fRenderingMode; DWRITE_TEXTURE_TYPE fTextureType; DWRITE_MEASURING_MODE fMeasuringMode; -#if SK_HAS_DWRITE_2_H SkTScopedComPtr<IDWriteFactory2> fFactory2; bool fIsColorFont; -#endif }; #endif |