diff options
| author |  Hal Canary <halcanary@google.com> | 2018-07-25 16:52:48 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-07-31 20:11:19 +0000 |
| commit | f107a2fd014cd39c489060f2cd1b99cd49c7d0be (patch) | |
| tree | 5c324821344901869203bbe055be8d3f69f696cb /src/xps | |
| parent | 1935aa3d27cd4ed4aef2dc04360f247a541d4b00 (diff) | |
SkUTF
Create new header and namespace, `SkUTF` where we are putting all of our
robust, well documented UTF-8, UTF-16, and UTF-32 functions:
`SkUTF::{Count,Next,To}UTF{8,16,32}()`.
SkUTF.h and SkUTF.cpp do not depend on the rest of Skia and are suitable
for re-use in other modules.
Some of the old UTF-{8,16} functions still live in SkUtils.h; their use
will be phased out in future CLs.
Also added more unit testing and cleaned up old tests.
Removed functions that were unused outside of tests or used only once.
Change-Id: Iaa59b8705abccf9c4ba082f855da368a0bad8380
Reviewed-on: https://skia-review.googlesource.com/143306
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'src/xps')
| -rw-r--r-- | src/xps/SkXPSDevice.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/xps/SkXPSDevice.cpp b/src/xps/SkXPSDevice.cpp index b984ef3e88..c2b5e66406 100644 --- a/src/xps/SkXPSDevice.cpp +++ b/src/xps/SkXPSDevice.cpp @@ -1984,17 +1984,13 @@ HRESULT SkXPSDevice::AddGlyphs(IXpsOMObjectFactory* xpsFactory, } static int num_glyph_guess(SkPaint::TextEncoding encoding, const void* text, size_t byteLength) { - switch (encoding) { - case SkPaint::kUTF8_TextEncoding: - return SkUTF8_CountUnichars(text, byteLength); - case SkPaint::kUTF16_TextEncoding: - return SkUTF16_CountUnichars(text, byteLength); - case SkPaint::kGlyphID_TextEncoding: + static_assert((int)SkTypeface::kUTF8_Encoding == (int)SkPaint::kUTF8_TextEncoding, ""); + static_assert((int)SkTypeface::kUTF16_Encoding == (int)SkPaint::kUTF16_TextEncoding, ""); + static_assert((int)SkTypeface::kUTF32_Encoding == (int)SkPaint::kUTF32_TextEncoding, ""); + if (encoding == SkPaint::kGlyphID_TextEncoding) { return SkToInt(byteLength / 2); - default: - SK_ABORT("Invalid Text Encoding"); } - return 0; + return SkUTFN_CountUnichars((SkTypeface::Encoding)encoding, text, byteLength); } static bool text_must_be_pathed(const SkPaint& paint, const SkMatrix& matrix) { |