Changeset 248552 in webkit
- Timestamp:
- Aug 12, 2019 4:09:06 PM (5 years ago)
- Location:
- trunk
- Files:
-
- 28 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/ChangeLog
r248547 r248552 1 2019-08-12 Sam Weinig <weinig@apple.com> 2 3 Replace multiparameter overloads of append() in StringBuilder as a first step toward standardizinging on the flexibleAppend() implementation 4 https://bugs.webkit.org/show_bug.cgi?id=200614 5 6 Reviewed by Darin Adler. 7 8 Renames StringBuilder::append(const LChar*, unsigned), StringBuilder::append(const UChar*, unsigned) and 9 StringBuilder::append(const char*, unsigned) to StringBuilder::appendCharacters(...). 10 11 Renames StringBuilder::append(const String& string, unsigned offset, unsigned length) to 12 StringBuilder::appendSubstring(...). 13 14 * dfg/DFGStrengthReductionPhase.cpp: 15 (JSC::DFG::StrengthReductionPhase::handleNode): 16 * runtime/ConfigFile.cpp: 17 (JSC::ConfigFile::parse): 18 * runtime/LiteralParser.cpp: 19 (JSC::LiteralParser<CharType>::Lexer::lexStringSlow): 20 * tools/FunctionOverrides.cpp: 21 (JSC::parseClause): 22 Update for renames. 23 1 24 2019-08-12 Adrian Perez de Castro <aperez@igalia.com> 2 25 -
trunk/Source/JavaScriptCore/dfg/DFGStrengthReductionPhase.cpp
r247387 r248552 855 855 unsigned replLen = replace.length(); 856 856 if (lastIndex < result.start || replLen) { 857 builder.append (string, lastIndex, result.start - lastIndex);857 builder.appendSubstring(string, lastIndex, result.start - lastIndex); 858 858 if (replLen) { 859 859 StringBuilder replacement; … … 900 900 else { 901 901 if (lastIndex < string.length()) 902 builder.append (string, lastIndex, string.length() - lastIndex);902 builder.appendSubstring(string, lastIndex, string.length() - lastIndex); 903 903 904 904 m_node->convertToLazyJSConstant(m_graph, LazyJSValue::newString(m_graph, builder.toString())); -
trunk/Source/JavaScriptCore/runtime/ConfigFile.cpp
r243754 r248552 315 315 p++; 316 316 317 builder.append (optionNameStart, p - optionNameStart);317 builder.appendCharacters(optionNameStart, p - optionNameStart); 318 318 319 319 while (*p && isASCIISpace(*p) && *p != '=') … … 337 337 p++; 338 338 339 builder.append (optionValueStart, p - optionValueStart);339 builder.appendCharacters(optionValueStart, p - optionValueStart); 340 340 builder.append('\n'); 341 341 -
trunk/Source/JavaScriptCore/runtime/LiteralParser.cpp
r239427 r248552 623 623 624 624 if (!m_builder.isEmpty()) 625 m_builder.append (runStart, m_ptr - runStart);625 m_builder.appendCharacters(runStart, m_ptr - runStart); 626 626 627 627 slowPathBegin: 628 628 if ((m_mode != NonStrictJSON) && m_ptr < m_end && *m_ptr == '\\') { 629 629 if (m_builder.isEmpty() && runStart < m_ptr) 630 m_builder.append (runStart, m_ptr - runStart);630 m_builder.appendCharacters(runStart, m_ptr - runStart); 631 631 ++m_ptr; 632 632 if (m_ptr >= m_end) { -
trunk/Source/JavaScriptCore/tools/FunctionOverrides.cpp
r239569 r248552 218 218 FAIL_WITH_ERROR(SYNTAX_ERROR, ("Unexpected characters after '", keyword, "' clause end delimiter '", delimiter, "':\n", line, "\n")); 219 219 220 builder.append (line, p - line + 1);220 builder.appendCharacters(line, p - line + 1); 221 221 return builder.toString(); 222 222 } -
trunk/Source/WTF/ChangeLog
r248546 r248552 1 2019-08-12 Sam Weinig <weinig@apple.com> 2 3 Replace multiparameter overloads of append() in StringBuilder as a first step toward standardizinging on the flexibleAppend() implementation 4 https://bugs.webkit.org/show_bug.cgi?id=200614 5 6 Reviewed by Darin Adler. 7 8 Renames StringBuilder::append(const LChar*, unsigned), StringBuilder::append(const UChar*, unsigned) and 9 StringBuilder::append(const char*, unsigned) to StringBuilder::appendCharacters(...). 10 11 Renames StringBuilder::append(const String& string, unsigned offset, unsigned length) to 12 StringBuilder::appendSubstring(...). 13 14 * wtf/HexNumber.h: 15 (WTF::appendUnsignedAsHexFixedSize): 16 Add overload that explicitly takes a StringBuilder to work around rename from append to appendCharacters. 17 18 * wtf/text/StringBuilder.cpp: 19 (WTF::StringBuilder::appendCharacters): 20 (WTF::StringBuilder::append): 21 * wtf/text/StringBuilder.h: 22 (WTF::StringBuilder::appendCharacters): 23 (WTF::StringBuilder::append): 24 (WTF::StringBuilder::appendSubstring): 25 (WTF::StringBuilder::appendLiteral): 26 (WTF::IntegerToStringConversionTrait<StringBuilder>::flush): 27 Update for renames. 28 1 29 2019-08-12 Yusuke Suzuki <ysuzuki@apple.com> 2 30 -
trunk/Source/WTF/wtf/HexNumber.h
r248546 r248552 22 22 23 23 #include <array> 24 #include <wtf/text/StringBuilder.h> 24 25 #include <wtf/text/StringConcatenate.h> 25 26 … … 73 74 } 74 75 76 // FIXME: Consider renaming to appendHex. 77 // Same as appendUnsignedAsHex, but zero-padding to get at least the desired number of digits. 78 template<typename NumberType> 79 inline void appendUnsignedAsHexFixedSize(NumberType number, StringBuilder& destination, unsigned minimumDigits, HexConversionMode mode = Uppercase) 80 { 81 // Each byte can generate up to two digits. 82 std::array<LChar, sizeof(NumberType) * 2> buffer; 83 auto result = Internal::appendHex(buffer, number, minimumDigits, mode); 84 destination.appendCharacters(result.first, result.second); 85 } 86 75 87 struct HexNumberBuffer { 76 88 WTF_MAKE_STRUCT_FAST_ALLOCATED; -
trunk/Source/WTF/wtf/text/StringBuilder.cpp
r247537 r248552 304 304 } 305 305 306 void StringBuilder::append (const UChar* characters, unsigned length)306 void StringBuilder::appendCharacters(const UChar* characters, unsigned length) 307 307 { 308 308 if (!length || hasOverflowed()) … … 315 315 // Append as 8 bit character 316 316 LChar lChar = static_cast<LChar>(*characters); 317 return append (&lChar, 1);317 return appendCharacters(&lChar, 1); 318 318 } 319 319 … … 346 346 } 347 347 348 void StringBuilder::append (const LChar* characters, unsigned length)348 void StringBuilder::appendCharacters(const LChar* characters, unsigned length) 349 349 { 350 350 if (!length || hasOverflowed()) … … 384 384 // Fast path: avoid constructing a temporary String when possible. 385 385 if (auto* characters = CFStringGetCStringPtr(string, kCFStringEncodingISOLatin1)) { 386 append (reinterpret_cast<const LChar*>(characters), CFStringGetLength(string));386 appendCharacters(reinterpret_cast<const LChar*>(characters), CFStringGetLength(string)); 387 387 return; 388 388 } -
trunk/Source/WTF/wtf/text/StringBuilder.h
r248546 r248552 70 70 ALWAYS_INLINE bool crashesOnOverflow() const { return m_length.shouldCrashOnOverflow(); } 71 71 72 WTF_EXPORT_PRIVATE void append (const UChar*, unsigned);73 WTF_EXPORT_PRIVATE void append (const LChar*, unsigned);74 75 ALWAYS_INLINE void append (const char* characters, unsigned length) { append(reinterpret_cast<const LChar*>(characters), length); }72 WTF_EXPORT_PRIVATE void appendCharacters(const UChar*, unsigned); 73 WTF_EXPORT_PRIVATE void appendCharacters(const LChar*, unsigned); 74 75 ALWAYS_INLINE void appendCharacters(const char* characters, unsigned length) { appendCharacters(reinterpret_cast<const LChar*>(characters), length); } 76 76 77 77 void append(const AtomString& atomString) … … 98 98 99 99 if (string.is8Bit()) 100 append (string.characters8(), string.length());100 appendCharacters(string.characters8(), string.length()); 101 101 else 102 append (string.characters16(), string.length());102 appendCharacters(string.characters16(), string.length()); 103 103 } 104 104 … … 123 123 124 124 if (other.is8Bit()) 125 append (other.characters8(), other.m_length.unsafeGet());125 appendCharacters(other.characters8(), other.m_length.unsafeGet()); 126 126 else 127 append (other.characters16(), other.m_length.unsafeGet());127 appendCharacters(other.characters16(), other.m_length.unsafeGet()); 128 128 } 129 129 … … 131 131 { 132 132 if (stringView.is8Bit()) 133 append (stringView.characters8(), stringView.length());133 appendCharacters(stringView.characters8(), stringView.length()); 134 134 else 135 append (stringView.characters16(), stringView.length());135 appendCharacters(stringView.characters16(), stringView.length()); 136 136 } 137 137 … … 143 143 #endif 144 144 145 void append (const String& string, unsigned offset, unsigned length)145 void appendSubstring(const String& string, unsigned offset, unsigned length) 146 146 { 147 147 if (!string.length()) … … 152 152 153 153 if (string.is8Bit()) 154 append (string.characters8() + offset, length);154 appendCharacters(string.characters8() + offset, length); 155 155 else 156 append (string.characters16() + offset, length);156 appendCharacters(string.characters16() + offset, length); 157 157 } 158 158 … … 160 160 { 161 161 if (characters) 162 append (characters, strlen(characters));162 appendCharacters(characters, strlen(characters)); 163 163 } 164 164 … … 181 181 } 182 182 } 183 append (&c, 1);183 appendCharacters(&c, 1); 184 184 } 185 185 … … 196 196 m_length++; 197 197 } else 198 append (&c, 1);198 appendCharacters(&c, 1); 199 199 } 200 200 … … 217 217 218 218 template<unsigned characterCount> 219 ALWAYS_INLINE void appendLiteral(const char (&characters)[characterCount]) { append (characters, characterCount - 1); }219 ALWAYS_INLINE void appendLiteral(const char (&characters)[characterCount]) { appendCharacters(characters, characterCount - 1); } 220 220 221 221 WTF_EXPORT_PRIVATE void appendNumber(int); … … 470 470 using ReturnType = void; 471 471 using AdditionalArgumentType = StringBuilder; 472 static void flush(LChar* characters, unsigned length, StringBuilder* stringBuilder) { stringBuilder->append (characters, length); }472 static void flush(LChar* characters, unsigned length, StringBuilder* stringBuilder) { stringBuilder->appendCharacters(characters, length); } 473 473 }; 474 474 -
trunk/Source/WebCore/ChangeLog
r248547 r248552 1 2019-08-12 Sam Weinig <weinig@apple.com> 2 3 Replace multiparameter overloads of append() in StringBuilder as a first step toward standardizinging on the flexibleAppend() implementation 4 https://bugs.webkit.org/show_bug.cgi?id=200614 5 6 Reviewed by Darin Adler. 7 8 Renames StringBuilder::append(const LChar*, unsigned), StringBuilder::append(const UChar*, unsigned) and 9 StringBuilder::append(const char*, unsigned) to StringBuilder::appendCharacters(...). 10 11 Renames StringBuilder::append(const String& string, unsigned offset, unsigned length) to 12 StringBuilder::appendSubstring(...). 13 14 * dom/Range.cpp: 15 (WebCore::Range::toString const): 16 * editing/Editing.cpp: 17 (WebCore::stringWithRebalancedWhitespace): 18 * editing/MarkupAccumulator.cpp: 19 (WebCore::appendCharactersReplacingEntitiesInternal): 20 * editing/TextIterator.cpp: 21 (WebCore::TextIteratorCopyableText::appendToStringBuilder const): 22 * html/HTMLTextFormControlElement.cpp: 23 (WebCore::HTMLTextFormControlElement::valueWithHardLineBreaks const): 24 * html/parser/HTMLTokenizer.cpp: 25 (WebCore::HTMLTokenizer::bufferedCharacters const): 26 * platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp: 27 (WebCore::InbandTextTrackPrivateAVF::processNativeSamples): 28 * platform/text/SegmentedString.cpp: 29 (WebCore::SegmentedString::Substring::appendTo const): 30 * platform/text/TextCodecICU.cpp: 31 (WebCore::TextCodecICU::decode): 32 * xml/XSLTProcessorLibxslt.cpp: 33 (WebCore::writeToStringBuilder): 34 Update for renames. 35 1 36 2019-08-12 Adrian Perez de Castro <aperez@igalia.com> 2 37 -
trunk/Source/WebCore/dom/Range.cpp
r247730 r248552 947 947 unsigned start = node == &startContainer() ? std::min(m_start.offset(), length) : 0U; 948 948 unsigned end = node == &endContainer() ? std::min(std::max(start, m_end.offset()), length) : length; 949 builder.append (data, start, end - start);949 builder.appendSubstring(data, start, end - start); 950 950 } 951 951 } -
trunk/Source/WebCore/editing/Editing.cpp
r248037 r248552 421 421 continue; 422 422 rebalancedString.reserveCapacity(length); 423 rebalancedString.append (string, rebalancedString.length(), i - rebalancedString.length());423 rebalancedString.appendSubstring(string, rebalancedString.length(), i - rebalancedString.length()); 424 424 rebalancedString.append(selectedWhitespaceCharacter); 425 425 } … … 429 429 430 430 rebalancedString.reserveCapacity(length); 431 rebalancedString.append (string, rebalancedString.length(), length - rebalancedString.length());431 rebalancedString.appendSubstring(string, rebalancedString.length(), length - rebalancedString.length()); 432 432 return rebalancedString.toString(); 433 433 } -
trunk/Source/WebCore/editing/MarkupAccumulator.cpp
r248042 r248552 151 151 uint8_t substitution = character < WTF_ARRAY_LENGTH(entityMap) ? entityMap[character] : static_cast<uint8_t>(EntitySubstitutionNullIndex); 152 152 if (UNLIKELY(substitution != EntitySubstitutionNullIndex) && entitySubstitutionList[substitution].mask & entityMask) { 153 result.append (text + positionAfterLastEntity, i - positionAfterLastEntity);154 result.append (entitySubstitutionList[substitution].characters, entitySubstitutionList[substitution].length);153 result.appendCharacters(text + positionAfterLastEntity, i - positionAfterLastEntity); 154 result.appendCharacters(entitySubstitutionList[substitution].characters, entitySubstitutionList[substitution].length); 155 155 positionAfterLastEntity = i + 1; 156 156 } 157 157 } 158 result.append (text + positionAfterLastEntity, length - positionAfterLastEntity);158 result.appendCharacters(text + positionAfterLastEntity, length - positionAfterLastEntity); 159 159 } 160 160 -
trunk/Source/WebCore/editing/TextIterator.cpp
r244200 r248552 336 336 builder.append(m_singleCharacter); 337 337 else 338 builder.append (m_string, m_offset, m_length);338 builder.appendSubstring(m_string, m_offset, m_length); 339 339 } 340 340 -
trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp
r247367 r248552 718 718 while (breakNode == node && breakOffset <= length) { 719 719 if (breakOffset > position) { 720 result.append (data, position, breakOffset - position);720 result.appendSubstring(data, position, breakOffset - position); 721 721 position = breakOffset; 722 722 result.append(newlineCharacter); … … 724 724 getNextSoftBreak(line, breakNode, breakOffset); 725 725 } 726 result.append (data, position, length - position);726 result.appendSubstring(data, position, length - position); 727 727 } 728 728 while (breakNode == node) -
trunk/Source/WebCore/html/parser/HTMLTokenizer.cpp
r246490 r248552 1402 1402 characters.append('<'); 1403 1403 characters.append('/'); 1404 characters.append (m_temporaryBuffer.data(), m_temporaryBuffer.size());1404 characters.appendCharacters(m_temporaryBuffer.data(), m_temporaryBuffer.size()); 1405 1405 return characters.toString(); 1406 1406 } -
trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp
r243164 r248552 530 530 // reccognized this string as a full header. 531 531 StringBuilder header; 532 header.append (reinterpret_cast<const unsigned char*>(CFDataGetBytePtr(webvttHeaderData)), length);532 header.appendCharacters(reinterpret_cast<const unsigned char*>(CFDataGetBytePtr(webvttHeaderData)), length); 533 533 header.append("\n\n"); 534 534 -
trunk/Source/WebCore/platform/text/SegmentedString.cpp
r209129 r248552 28 28 inline void SegmentedString::Substring::appendTo(StringBuilder& builder) const 29 29 { 30 builder.append (string, string.length() - length, length);30 builder.appendSubstring(string, string.length() - length, length); 31 31 } 32 32 -
trunk/Source/WebCore/platform/text/TextCodecICU.cpp
r225618 r248552 308 308 do { 309 309 int ucharsDecoded = decodeToBuffer(buffer, bufferLimit, source, sourceLimit, offsets, flush, err); 310 result.append (buffer, ucharsDecoded);310 result.appendCharacters(buffer, ucharsDecoded); 311 311 } while (err == U_BUFFER_OVERFLOW_ERROR); 312 312 -
trunk/Source/WebCore/platform/wpe/RenderThemeWPE.cpp
r236666 r248552 59 59 { 60 60 StringBuilder scriptBuilder; 61 scriptBuilder.append (mediaControlsLocalizedStringsJavaScript, sizeof(mediaControlsLocalizedStringsJavaScript));62 scriptBuilder.append (mediaControlsBaseJavaScript, sizeof(mediaControlsBaseJavaScript));61 scriptBuilder.appendCharacters(mediaControlsLocalizedStringsJavaScript, sizeof(mediaControlsLocalizedStringsJavaScript)); 62 scriptBuilder.appendCharacters(mediaControlsBaseJavaScript, sizeof(mediaControlsBaseJavaScript)); 63 63 return scriptBuilder.toString(); 64 64 } -
trunk/Source/WebCore/rendering/RenderThemeGtk.cpp
r248033 r248552 1213 1213 { 1214 1214 StringBuilder scriptBuilder; 1215 scriptBuilder.append (mediaControlsLocalizedStringsJavaScript, sizeof(mediaControlsLocalizedStringsJavaScript));1216 scriptBuilder.append (mediaControlsBaseJavaScript, sizeof(mediaControlsBaseJavaScript));1217 scriptBuilder.append (mediaControlsGtkJavaScript, sizeof(mediaControlsGtkJavaScript));1215 scriptBuilder.appendCharacters(mediaControlsLocalizedStringsJavaScript, sizeof(mediaControlsLocalizedStringsJavaScript)); 1216 scriptBuilder.appendCharacters(mediaControlsBaseJavaScript, sizeof(mediaControlsBaseJavaScript)); 1217 scriptBuilder.appendCharacters(mediaControlsGtkJavaScript, sizeof(mediaControlsGtkJavaScript)); 1218 1218 return scriptBuilder.toString(); 1219 1219 } -
trunk/Source/WebCore/xml/XSLTProcessorLibxslt.cpp
r244828 r248552 191 191 } 192 192 193 resultOutput.append (outputBuffer.data(), outputOffset);193 resultOutput.appendCharacters(outputBuffer.data(), outputOffset); 194 194 return inputOffset; 195 195 } -
trunk/Source/WebKit/ChangeLog
r248550 r248552 1 2019-08-12 Sam Weinig <weinig@apple.com> 2 3 Replace multiparameter overloads of append() in StringBuilder as a first step toward standardizinging on the flexibleAppend() implementation 4 https://bugs.webkit.org/show_bug.cgi?id=200614 5 6 Reviewed by Darin Adler. 7 8 Renames StringBuilder::append(const LChar*, unsigned), StringBuilder::append(const UChar*, unsigned) and 9 StringBuilder::append(const char*, unsigned) to StringBuilder::appendCharacters(...). 10 11 Renames StringBuilder::append(const String& string, unsigned offset, unsigned length) to 12 StringBuilder::appendSubstring(...). 13 14 * Shared/mac/AuxiliaryProcessMac.mm: 15 (WebKit::setAndSerializeSandboxParameters): 16 * UIProcess/WebProcessPool.cpp: 17 (WebKit::WebProcessPool::didReceiveInvalidMessage): 18 Update for renames. 19 1 20 2019-08-12 Dean Jackson <dino@apple.com> 2 21 -
trunk/Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm
r246892 r248552 235 235 CRASH(); 236 236 } 237 builder.append(name , strlen(name));237 builder.append(name); 238 238 builder.append(':'); 239 builder.append(value , strlen(value));239 builder.append(value); 240 240 builder.append(':'); 241 241 } … … 244 244 if (!contents) 245 245 return WTF::nullopt; 246 builder.append (contents->data(), contents->size());246 builder.appendCharacters(contents->data(), contents->size()); 247 247 } else 248 248 builder.append(profileOrProfilePath); -
trunk/Source/WebKit/UIProcess/WebProcessPool.cpp
r248526 r248552 793 793 794 794 StringBuilder messageNameStringBuilder; 795 messageNameStringBuilder.append (messageReceiverName.data(), messageReceiverName.size());795 messageNameStringBuilder.appendCharacters(messageReceiverName.data(), messageReceiverName.size()); 796 796 messageNameStringBuilder.append('.'); 797 messageNameStringBuilder.append (messageName.data(), messageName.size());797 messageNameStringBuilder.appendCharacters(messageName.data(), messageName.size()); 798 798 799 799 s_invalidMessageCallback(toAPI(API::String::create(messageNameStringBuilder.toString()).ptr())); -
trunk/Tools/ChangeLog
r248548 r248552 1 2019-08-12 Sam Weinig <weinig@apple.com> 2 3 Replace multiparameter overloads of append() in StringBuilder as a first step toward standardizinging on the flexibleAppend() implementation 4 https://bugs.webkit.org/show_bug.cgi?id=200614 5 6 Reviewed by Darin Adler. 7 8 Renames StringBuilder::append(const LChar*, unsigned), StringBuilder::append(const UChar*, unsigned) and 9 StringBuilder::append(const char*, unsigned) to StringBuilder::appendCharacters(...). 10 11 Renames StringBuilder::append(const String& string, unsigned offset, unsigned length) to 12 StringBuilder::appendSubstring(...). 13 14 * TestWebKitAPI/Tests/WTF/StringBuilder.cpp: 15 (TestWebKitAPI::TEST): 16 Update for renames. 17 1 18 2019-08-12 Megan Gardner <megan_gardner@apple.com> 2 19 -
trunk/Tools/TestWebKitAPI/Tests/WTF/StringBuilder.cpp
r247537 r248552 65 65 builder.append("abcd"); 66 66 expectBuilderContent("0123456789abcd", builder); 67 builder.append ("efgh", 3);67 builder.appendCharacters("efgh", 3); 68 68 expectBuilderContent("0123456789abcdefg", builder); 69 69 builder.append(""); … … 74 74 builder.toString(); // Test after reifyString(). 75 75 StringBuilder builder1; 76 builder.append ("", 0);76 builder.appendCharacters("", 0); 77 77 expectBuilderContent("0123456789abcdefg#", builder); 78 builder1.append (builder.characters8(), builder.length());78 builder1.appendCharacters(builder.characters8(), builder.length()); 79 79 builder1.append("XYZ"); 80 builder.append (builder1.characters8(), builder1.length());80 builder.appendCharacters(builder1.characters8(), builder1.length()); 81 81 expectBuilderContent("0123456789abcdefg#0123456789abcdefg#XYZ", builder); 82 82 … … 105 105 UChar32 frakturAChar = 0x1D504; 106 106 const UChar data[] = { U16_LEAD(frakturAChar), U16_TRAIL(frakturAChar) }; 107 builder2.append (data, 2);107 builder2.appendCharacters(data, 2); 108 108 ASSERT_EQ(2U, builder2.length()); 109 109 String result2 = builder2.toString(); 110 110 ASSERT_EQ(2U, result2.length()); 111 111 builder.append(builder2); 112 builder.append (data, 2);112 builder.appendCharacters(data, 2); 113 113 ASSERT_EQ(4U, builder.length()); 114 114 const UChar resultArray[] = { U16_LEAD(frakturAChar), U16_TRAIL(frakturAChar), U16_LEAD(frakturAChar), U16_TRAIL(frakturAChar) }; … … 361 361 { // AtomString constructed from an empty char* string. 362 362 StringBuilder builder; 363 builder.append ("", 0);363 builder.appendCharacters("", 0); 364 364 AtomString atomString = builder.toAtomString(); 365 365 ASSERT_EQ(emptyAtom(), atomString); -
trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitWebContext.cpp
r248437 r248552 272 272 273 273 if (contentLength <= baseLength) 274 builder.append (baseString, 0, contentLength);274 builder.appendSubstring(baseString, 0, contentLength); 275 275 else { 276 276 unsigned currentLength = 0; … … 279 279 builder.append(baseString); 280 280 else 281 builder.append (baseString, 0, contentLength - currentLength);281 builder.appendSubstring(baseString, 0, contentLength - currentLength); 282 282 283 283 // Account for the 12 characters of the '<html><body>' prefix.
Note: See TracChangeset
for help on using the changeset viewer.