diff options
| author |  Jim Van Verth <jvanverth@google.com> | 2018-03-23 14:39:42 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-03-23 14:39:51 +0000 |
| commit | af78a942179143e4646871fc797e2ce17c23a594 (patch) | |
| tree | e1df52c03c579436005b1098a500a3523c816000 /src/ports | |
| parent | 8c53d465e3ceb3898f8037b61046c198bbec2fca (diff) | |
Revert "Add color fonts."
This reverts commit c912d6133c66df7cde3d64adc76941856a12da64.
Reason for revert: Causing TSAN issues.
Original change's description:
> Add color fonts.
>
> BUG=skia:7624
>
> Change-Id: Id2b7449048591892ff802484d5e3745a7e1402bb
> Reviewed-on: https://skia-review.googlesource.com/109521
> Commit-Queue: Ben Wagner <bungeman@google.com>
> Reviewed-by: Mike Klein <mtklein@google.com>
> Reviewed-by: Herb Derby <herb@google.com>
TBR=mtklein@google.com,bungeman@google.com,herb@google.com
Change-Id: I2ccd1f00e91bb92b7059323c95da0dd3de954164
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:7624
Reviewed-on: https://skia-review.googlesource.com/116141
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>
Diffstat (limited to 'src/ports')
| -rw-r--r-- | src/ports/SkFontHost_win.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/ports/SkFontHost_win.cpp b/src/ports/SkFontHost_win.cpp index abe1550a01..f0eb7b7d9b 100644 --- a/src/ports/SkFontHost_win.cpp +++ b/src/ports/SkFontHost_win.cpp @@ -830,13 +830,6 @@ uint16_t SkScalerContext_GDI::generateCharToGlyph(SkUnichar utf32) { HRZM(ScriptItemize(utf16, numWCHAR, maxItems, &sc, nullptr, si, &numItems), "Could not itemize character."); - // Disable any attempt at shaping. - // Without this ScriptShape may return 0x80040200 (USP_E_SCRIPT_NOT_IN_FONT) - // when all that is desired here is a simple cmap lookup. - for (SCRIPT_ITEM& item : si) { - item.a.eScript = SCRIPT_UNDEFINED; - } - // Sometimes ScriptShape cannot find a glyph for a non-BMP and returns 2 space glyphs. static const int maxGlyphs = 2; SCRIPT_VISATTR vsa[maxGlyphs]; |