1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/SkStringUtils.cpp b/src/core/SkStringUtils.cpp
index 500478585f..1743d0d26c 100644
--- a/src/core/SkStringUtils.cpp
+++ b/src/core/SkStringUtils.cpp
@@ -62,8 +62,8 @@ SkString SkStringFromUTF16(const uint16_t* src, size_t count) {
         const uint16_t* end = src + count;
         for (const uint16_t* ptr = src; ptr < end;) {
             const uint16_t* last = ptr;
-            SkUnichar u = SkUTF16_NextUnichar(&ptr, stop);
-            size_t s = SkUTF8_FromUnichar(u);
+            SkUnichar u = SkUTF::NextUTF16(&ptr, stop);
+            size_t s = SkUTF::ToUTF8(u);
             if (n > UINT32_MAX - s) {
                 end = last;  // truncate input string
                 break;
@@ -73,7 +73,7 @@ SkString SkStringFromUTF16(const uint16_t* src, size_t count) {
         ret = SkString(n);
         char* out = ret.writable_str();
         for (const uint16_t* ptr = src; ptr < end;) {
-            out += SkUTF8_FromUnichar(SkUTF16_NextUnichar(&ptr, stop), out);
+            out += SkUTF::ToUTF8(SkUTF::NextUTF16(&ptr, stop), out);
         }
         SkASSERT(out == ret.writable_str() + n);
     }