Attachment #476010 for bug #618644




JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars)
{
    initializeThreading();
    return OpaqueJSString::create(reinterpret_cast<const UChar*>(chars), numChars).leakRef();
}

JSStringRef JSStringCreateWithUTF8CString(const char* string)

JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars, size_t numChars)
{
    initializeThreading();
    return OpaqueJSString::create(StringImpl::createWithoutCopying(reinterpret_cast<const UChar*>(chars), numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef();
}

JSStringRef JSStringRetain(JSStringRef string)


const JSChar* JSStringGetCharactersPtr(JSStringRef string)
{
    return reinterpret_cast<const JSChar*>(string->characters());
}

size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string)

Lines 107-113 String formatDateTime(const GregorianDateTime& t, DateTimeFormat format, bool as Link Here

(-)a/Source/JavaScriptCore/runtime/DateConversion.cpp (-1 / +2 lines)
107	#if OS(WINDOWS)	107	#if OS(WINDOWS)
108	TIME_ZONE_INFORMATION timeZoneInformation;	108	TIME_ZONE_INFORMATION timeZoneInformation;
109	GetTimeZoneInformation(&timeZoneInformation);	109	GetTimeZoneInformation(&timeZoneInformation);
110	const WCHAR* timeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName;	110	const WCHAR* winTimeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName;
		111	String timeZoneName(reinterpret_cast<const UChar*>(winTimeZoneName));
111	#else	112	#else
112	struct tm gtm = t;	113	struct tm gtm = t;
113	char timeZoneName[70];	114	char timeZoneName[70];

Lines 72-77 namespace WTF { Link Here

(-)a/Source/WTF/wtf/TypeTraits.h (+3 lines)
72	template<> struct IsInteger<unsigned long> { static const bool value = true; };	72	template<> struct IsInteger<unsigned long> { static const bool value = true; };
73	template<> struct IsInteger<long long> { static const bool value = true; };	73	template<> struct IsInteger<long long> { static const bool value = true; };
74	template<> struct IsInteger<unsigned long long> { static const bool value = true; };	74	template<> struct IsInteger<unsigned long long> { static const bool value = true; };
		75	#if __cplusplus >= 201103L \|\| defined(__GXX_EXPERIMENTAL_CXX0X__) \|\| (defined(_MSC_VER) && (_MSC_VER >= 1900))
		76	template<> struct IsInteger<char16_t> { static const bool value = true; };
		77	#endif
75	#if !COMPILER(MSVC) \|\| defined(_NATIVE_WCHAR_T_DEFINED)	78	#if !COMPILER(MSVC) \|\| defined(_NATIVE_WCHAR_T_DEFINED)
76	template<> struct IsInteger<wchar_t> { static const bool value = true; };	79	template<> struct IsInteger<wchar_t> { static const bool value = true; };
77	#endif	80	#endif

Lines 55-61 size_t WKStringGetLength(WKStringRef stringRef) Link Here

(-)a/Source/WebKit2/Shared/API/c/WKString.cpp (-2 / +1 lines)
55	size_t WKStringGetCharacters(WKStringRef stringRef, WKChar* buffer, size_t bufferLength)	55	size_t WKStringGetCharacters(WKStringRef stringRef, WKChar* buffer, size_t bufferLength)
56	{	56	{
57	COMPILE_ASSERT(sizeof(WKChar) == sizeof(UChar), WKStringGetCharacters_sizeof_WKChar_matches_UChar);	57	COMPILE_ASSERT(sizeof(WKChar) == sizeof(UChar), WKStringGetCharacters_sizeof_WKChar_matches_UChar);
58	return (toImpl(stringRef)->getCharacters(static_cast<UChar*>(buffer), bufferLength));	58	return (toImpl(stringRef)->getCharacters(reinterpret_cast<UChar*>(buffer), bufferLength));
59	}	59	}
60		60
61	size_t WKStringGetMaximumUTF8CStringSize(WKStringRef stringRef)	61	size_t WKStringGetMaximumUTF8CStringSize(WKStringRef stringRef)
62	-

Return to bug 618644

Lines 37-43 using namespace WTF::Unicode; Link Here

(-)a/Source/JavaScriptCore/API/JSStringRef.cpp (-3 / +3 lines)
37	JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars)	37	JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars)
38	{	38	{
39	initializeThreading();	39	initializeThreading();
40	return OpaqueJSString::create(chars, numChars).leakRef();	40	return OpaqueJSString::create(reinterpret_cast<const UChar*>(chars), numChars).leakRef();
41	}	41	}
42		42
43	JSStringRef JSStringCreateWithUTF8CString(const char* string)	43	JSStringRef JSStringCreateWithUTF8CString(const char* string)
Lines 62-68 JSStringRef JSStringCreateWithUTF8CString(const char* string) Link Here
62	JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars, size_t numChars)	62	JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars, size_t numChars)
63	{	63	{
64	initializeThreading();	64	initializeThreading();
65	return OpaqueJSString::create(StringImpl::createWithoutCopying(chars, numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef();	65	return OpaqueJSString::create(StringImpl::createWithoutCopying(reinterpret_cast<const UChar*>(chars), numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef();
66	}	66	}
67		67
68	JSStringRef JSStringRetain(JSStringRef string)	68	JSStringRef JSStringRetain(JSStringRef string)
Lines 83-89 size_t JSStringGetLength(JSStringRef string) Link Here
83		83
84	const JSChar* JSStringGetCharactersPtr(JSStringRef string)	84	const JSChar* JSStringGetCharactersPtr(JSStringRef string)
85	{	85	{
86	return string->characters();	86	return reinterpret_cast<const JSChar*>(string->characters());
87	}	87	}
88		88
89	size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string)	89	size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string)