commit ee08b4a2e92e3273293a62cf1672d85ce9e9785f
author Hal Canary <halcanary@google.com> Thu Mar 01 15:56:37 2018 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Mar 01 22:16:34 2018 +0000
tree a64fc01c6eb77cc4c0aea8602293aa91d8669a83
parent 9b1a8860611e17fd25c0d322ef4d28cfa601e82e

SkString: remove externally unused ::setUTF16() from API

Moved to SkStringUtils in src/

Change-Id: I026e3a325570bbf34e90797d921cb2f05b9a29f6
Reviewed-on: https://skia-review.googlesource.com/111602
Commit-Queue: Hal Canary <halcanary@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>

src/ports/SkOSFile_win.cpp

diff --git a/src/ports/SkOSFile_win.cpp b/src/ports/SkOSFile_win.cpp
index 05afcc6..5488712 100644
--- a/src/ports/SkOSFile_win.cpp
+++ b/src/ports/SkOSFile_win.cpp
@@ -11,6 +11,7 @@
 #include "SkLeanWindows.h"
 #include "SkMalloc.h"
 #include "SkOSFile.h"
+#include "SkStringUtils.h"
 #include "SkTFitsIn.h"
 
 #include <io.h>
@@ -250,7 +251,10 @@
     }
     // if we get here, we've found a file/dir
     if (name) {
-        name->setUTF16((uint16_t*)dataPtr->cFileName);
+        const uint16_t* utf16name = (const uint16_t*)dataPtr->cFileName;
+        const uint16_t* ptr = utf16name;
+        while (*ptr != 0) { ++ptr; }
+        *name = SkStringFromUTF16(utf16name, ptr - utf16name);
     }
     return true;
 }