diff options
author | Konstantin Tokarev <annulen@yandex.ru> | 2017-05-08 01:22:24 +0300 |
---|---|---|
committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-05-08 22:46:34 +0000 |
commit | 0fcedcd17cc00d3dd44c718b3cb36c1033319671 (patch) | |
tree | a794dff3274695e99c651902dde93d934ea7a5af /Source/JavaScriptCore/API/JSStringRef.cpp | |
parent | 6469f308c0f0f710544d7d55c7655384bed27795 (diff) | |
download | qtwebkit-0fcedcd17cc00d3dd44c718b3cb36c1033319671.tar.gz |
Import WebKit commit b25ce6eca994718717218f56d045e75a4a22f989wip/next
Change-Id: Ied338d9a16b44b5da35d484e80a21acc284eb625
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/JavaScriptCore/API/JSStringRef.cpp')
-rw-r--r-- | Source/JavaScriptCore/API/JSStringRef.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/JavaScriptCore/API/JSStringRef.cpp b/Source/JavaScriptCore/API/JSStringRef.cpp index c9b380ce6..909540481 100644 --- a/Source/JavaScriptCore/API/JSStringRef.cpp +++ b/Source/JavaScriptCore/API/JSStringRef.cpp @@ -37,7 +37,7 @@ using namespace WTF::Unicode; JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars) { initializeThreading(); - return &OpaqueJSString::create(chars, numChars).leakRef(); + return &OpaqueJSString::create(reinterpret_cast<const UChar*>(chars), numChars).leakRef(); } JSStringRef JSStringCreateWithUTF8CString(const char* string) @@ -62,7 +62,7 @@ JSStringRef JSStringCreateWithUTF8CString(const char* string) JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars, size_t numChars) { initializeThreading(); - return OpaqueJSString::create(StringImpl::createWithoutCopying(chars, numChars)).leakRef(); + return OpaqueJSString::create(StringImpl::createWithoutCopying(reinterpret_cast<const UChar*>(chars), numChars)).leakRef(); } JSStringRef JSStringRetain(JSStringRef string) @@ -87,7 +87,7 @@ const JSChar* JSStringGetCharactersPtr(JSStringRef string) { if (!string) return nullptr; - return string->characters(); + return reinterpret_cast<const JSChar*>(string->characters()); } size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string) |