From 6882a04fb36642862b11efe514251d32070c3d65 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Thu, 25 Aug 2016 19:20:41 +0300 Subject: Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443) Change-Id: I3b1d8a2808782c9f34d50240000e20cb38d3680f Reviewed-by: Konstantin Tokarev --- Source/JavaScriptCore/runtime/JSStringBuilder.h | 139 +++++++----------------- 1 file changed, 42 insertions(+), 97 deletions(-) (limited to 'Source/JavaScriptCore/runtime/JSStringBuilder.h') diff --git a/Source/JavaScriptCore/runtime/JSStringBuilder.h b/Source/JavaScriptCore/runtime/JSStringBuilder.h index 5d4960e89..32b39f0a4 100644 --- a/Source/JavaScriptCore/runtime/JSStringBuilder.h +++ b/Source/JavaScriptCore/runtime/JSStringBuilder.h @@ -32,6 +32,7 @@ namespace JSC { +// FIXME: Should move the last few callers over from this to WTF::StringBuilder. class JSStringBuilder { public: JSStringBuilder() @@ -40,73 +41,64 @@ public: { } - void append(const UChar u) + void append(LChar character) { if (m_is8Bit) { - if (u < 0xff) { - LChar c = u; - m_okay &= buffer8.tryAppend(&c, 1); + m_okay &= buffer8.tryAppend(&character, 1); + return; + } + UChar upconvertedCharacter = character; + m_okay &= buffer16.tryAppend(&upconvertedCharacter, 1); + } + + void append(UChar character) + { + if (m_is8Bit) { + if (character < 0x100) { + LChar narrowedCharacter = character; + m_okay &= buffer8.tryAppend(&narrowedCharacter, 1); return; } upConvert(); } - m_okay &= buffer16.tryAppend(&u, 1); + m_okay &= buffer16.tryAppend(&character, 1); } void append(const char* str) { - append(str, strlen(str)); + append(reinterpret_cast(str), strlen(str)); } - void append(const char* str, size_t len) + JSValue build(ExecState* exec) { + if (!m_okay) + return throwOutOfMemoryError(exec); if (m_is8Bit) { - m_okay &= buffer8.tryAppend(reinterpret_cast(str), len); - return; - } - m_okay &= buffer8.tryReserveCapacity(buffer16.size() + len); - for (size_t i = 0; i < len; i++) { - UChar u = static_cast(str[i]); - m_okay &= buffer16.tryAppend(&u, 1); + buffer8.shrinkToFit(); + if (!buffer8.data()) + return throwOutOfMemoryError(exec); + return jsString(exec, String::adopt(buffer8)); } + buffer16.shrinkToFit(); + if (!buffer16.data()) + return throwOutOfMemoryError(exec); + return jsString(exec, String::adopt(buffer16)); } - void append(const LChar* str, size_t len) +private: + void append(const LChar* characters, size_t length) { if (m_is8Bit) { - m_okay &= buffer8.tryAppend(str, len); + m_okay &= buffer8.tryAppend(characters, length); return; } - m_okay &= buffer8.tryReserveCapacity(buffer16.size() + len); - for (size_t i = 0; i < len; i++) { - UChar u = str[i]; - m_okay &= buffer16.tryAppend(&u, 1); + // FIXME: There must be a more efficient way of doing this. + m_okay &= buffer16.tryReserveCapacity(buffer16.size() + length); + for (size_t i = 0; i < length; i++) { + UChar upconvertedCharacter = characters[i]; + m_okay &= buffer16.tryAppend(&upconvertedCharacter, 1); } } - - void append(const UChar* str, size_t len) - { - if (m_is8Bit) - upConvert(); // FIXME: We could check character by character its size. - m_okay &= buffer16.tryAppend(str, len); - } - - void append(const String& str) - { - unsigned length = str.length(); - - if (!length) - return; - - if (m_is8Bit) { - if (str.is8Bit()) { - m_okay &= buffer8.tryAppend(str.characters8(), length); - return; - } - upConvert(); - } - m_okay &= buffer16.tryAppend(str.characters(), length); - } void upConvert() { @@ -120,69 +112,22 @@ public: m_is8Bit = false; } - JSValue build(ExecState* exec) - { - if (!m_okay) - return throwOutOfMemoryError(exec); - if (m_is8Bit) { - buffer8.shrinkToFit(); - if (!buffer8.data()) - return throwOutOfMemoryError(exec); - return jsString(exec, String::adopt(buffer8)); - } - buffer16.shrinkToFit(); - if (!buffer16.data()) - return throwOutOfMemoryError(exec); - return jsString(exec, String::adopt(buffer16)); - } - -protected: Vector buffer8; Vector buffer16; bool m_okay; bool m_is8Bit; }; -template -inline JSValue jsMakeNontrivialString(ExecState* exec, StringType1 string1, StringType2 string2) -{ - PassRefPtr result = WTF::tryMakeString(string1, string2); - if (!result) - return throwOutOfMemoryError(exec); - return jsNontrivialString(exec, result); -} - -template -inline JSValue jsMakeNontrivialString(ExecState* exec, StringType1 string1, StringType2 string2, StringType3 string3) +template +inline JSValue jsMakeNontrivialString(ExecState* exec, StringType&& string) { - PassRefPtr result = WTF::tryMakeString(string1, string2, string3); - if (!result) - return throwOutOfMemoryError(exec); - return jsNontrivialString(exec, result); -} - -template -inline JSValue jsMakeNontrivialString(ExecState* exec, StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4) -{ - PassRefPtr result = WTF::tryMakeString(string1, string2, string3, string4); - if (!result) - return throwOutOfMemoryError(exec); - return jsNontrivialString(exec, result); -} - -template -inline JSValue jsMakeNontrivialString(ExecState* exec, StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4, StringType5 string5) -{ - PassRefPtr result = WTF::tryMakeString(string1, string2, string3, string4, string5); - if (!result) - return throwOutOfMemoryError(exec); - return jsNontrivialString(exec, result); + return jsNontrivialString(exec, std::forward(string)); } -template -inline JSValue jsMakeNontrivialString(ExecState* exec, StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4, StringType5 string5, StringType6 string6) +template +inline JSValue jsMakeNontrivialString(ExecState* exec, const StringType& string, const StringTypes&... strings) { - PassRefPtr result = WTF::tryMakeString(string1, string2, string3, string4, string5, string6); + String result = WTF::tryMakeString(string, strings...); if (!result) return throwOutOfMemoryError(exec); return jsNontrivialString(exec, result); -- cgit v1.2.1