diff options
| author |  bungeman <bungeman@google.com> | 2015-07-30 10:31:57 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-07-30 10:31:57 -0700 |
| commit | 24a104d94696bc4b5170e82a28ef05053b302a2d (patch) | |
| tree | 99fb0efd92ce6a7de10a0381a0613b41ce187521 /src/ports/SkFontMgr_android.cpp | |
| parent | c3eb50cd9e9a707b4198b81155ca13e552ec90c0 (diff) | |
Revert character in typeface test on Android.
This is a partial revert of f20488b4f2, particularly
https://skia.googlesource.com/skia/+/f20488b4f2139e6ca09fee7e39b731dd8ab467db%5E%21/#F11
BUG=chromium:515366
TBR=mtklein@google.com
This is a (non-automatic) revert.
Review URL: https://codereview.chromium.org/1265993003
Diffstat (limited to 'src/ports/SkFontMgr_android.cpp')
| -rw-r--r-- | src/ports/SkFontMgr_android.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/ports/SkFontMgr_android.cpp b/src/ports/SkFontMgr_android.cpp index 88045a4b20..45c787a930 100644 --- a/src/ports/SkFontMgr_android.cpp +++ b/src/ports/SkFontMgr_android.cpp @@ -12,6 +12,7 @@ #include "SkFontMgr_android.h" #include "SkFontMgr_android_parser.h" #include "SkFontStyle.h" +#include "SkPaint.h" #include "SkRefCnt.h" #include "SkString.h" #include "SkStream.h" @@ -19,7 +20,6 @@ #include "SkTDArray.h" #include "SkTSearch.h" #include "SkTemplates.h" -#include "SkTypeface.h" #include "SkTypefaceCache.h" #include <limits> @@ -407,7 +407,13 @@ protected: continue; } - if (face->charsToGlyphs(&character, SkTypeface::kUTF32_Encoding, NULL, 0)) { + SkPaint paint; + paint.setTypeface(face); + paint.setTextEncoding(SkPaint::kUTF32_TextEncoding); + + uint16_t glyphID; + paint.textToGlyphs(&character, sizeof(character), &glyphID); + if (glyphID != 0) { return face.detach(); } } |