From f107a2fd014cd39c489060f2cd1b99cd49c7d0be Mon Sep 17 00:00:00 2001 From: Hal Canary Date: Wed, 25 Jul 2018 16:52:48 -0400 Subject: 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 Commit-Queue: Hal Canary --- src/core/SkFont.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/core/SkFont.cpp') diff --git a/src/core/SkFont.cpp b/src/core/SkFont.cpp index bde8c4c80b..081469f900 100644 --- a/src/core/SkFont.cpp +++ b/src/core/SkFont.cpp @@ -68,10 +68,10 @@ int SkFont::textToGlyphs(const void* text, size_t byteLength, SkTextEncoding enc switch (encoding) { case kUTF8_SkTextEncoding: - count = SkUTF8_CountUnichars((const char*)text, byteLength); + count = SkUTF::CountUTF8((const char*)text, byteLength); break; case kUTF16_SkTextEncoding: - count = SkUTF16_CountUnichars((const uint16_t*)text, byteLength); + count = SkUTF::CountUTF16((const uint16_t*)text, byteLength); break; case kUTF32_SkTextEncoding: count = SkToInt(byteLength >> 2); -- cgit v1.2.3