<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[248552] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/248552">248552</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2019-08-12 16:09:06 -0700 (Mon, 12 Aug 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Replace multiparameter overloads of append() in StringBuilder as a first step toward standardizinging on the flexibleAppend() implementation
https://bugs.webkit.org/show_bug.cgi?id=200614

Reviewed by Darin Adler.

Renames StringBuilder::append(const LChar*, unsigned), StringBuilder::append(const UChar*, unsigned) and 
StringBuilder::append(const char*, unsigned) to StringBuilder::appendCharacters(...).
        
Renames StringBuilder::append(const String& string, unsigned offset, unsigned length) to 
StringBuilder::appendSubstring(...).

Source/JavaScriptCore:

* dfg/DFGStrengthReductionPhase.cpp:
(JSC::DFG::StrengthReductionPhase::handleNode):
* runtime/ConfigFile.cpp:
(JSC::ConfigFile::parse):
* runtime/LiteralParser.cpp:
(JSC::LiteralParser<CharType>::Lexer::lexStringSlow):
* tools/FunctionOverrides.cpp:
(JSC::parseClause):
Update for renames.

Source/WebCore:

* dom/Range.cpp:
(WebCore::Range::toString const):
* editing/Editing.cpp:
(WebCore::stringWithRebalancedWhitespace):
* editing/MarkupAccumulator.cpp:
(WebCore::appendCharactersReplacingEntitiesInternal):
* editing/TextIterator.cpp:
(WebCore::TextIteratorCopyableText::appendToStringBuilder const):
* html/HTMLTextFormControlElement.cpp:
(WebCore::HTMLTextFormControlElement::valueWithHardLineBreaks const):
* html/parser/HTMLTokenizer.cpp:
(WebCore::HTMLTokenizer::bufferedCharacters const):
* platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp:
(WebCore::InbandTextTrackPrivateAVF::processNativeSamples):
* platform/text/SegmentedString.cpp:
(WebCore::SegmentedString::Substring::appendTo const):
* platform/text/TextCodecICU.cpp:
(WebCore::TextCodecICU::decode):
* xml/XSLTProcessorLibxslt.cpp:
(WebCore::writeToStringBuilder):
Update for renames.

Source/WebKit:

* Shared/mac/AuxiliaryProcessMac.mm:
(WebKit::setAndSerializeSandboxParameters):
* UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::didReceiveInvalidMessage):
Update for renames.

Source/WTF:

* wtf/HexNumber.h:
(WTF::appendUnsignedAsHexFixedSize):
Add overload that explicitly takes a StringBuilder to work around rename from append to appendCharacters.

* wtf/text/StringBuilder.cpp:
(WTF::StringBuilder::appendCharacters):
(WTF::StringBuilder::append):
* wtf/text/StringBuilder.h:
(WTF::StringBuilder::appendCharacters):
(WTF::StringBuilder::append):
(WTF::StringBuilder::appendSubstring):
(WTF::StringBuilder::appendLiteral):
(WTF::IntegerToStringConversionTrait<StringBuilder>::flush):
Update for renames.

Tools:

* TestWebKitAPI/Tests/WTF/StringBuilder.cpp:
(TestWebKitAPI::TEST):
Update for renames.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGStrengthReductionPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGStrengthReductionPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeConfigFilecpp">trunk/Source/JavaScriptCore/runtime/ConfigFile.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeLiteralParsercpp">trunk/Source/JavaScriptCore/runtime/LiteralParser.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoretoolsFunctionOverridescpp">trunk/Source/JavaScriptCore/tools/FunctionOverrides.cpp</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfHexNumberh">trunk/Source/WTF/wtf/HexNumber.h</a></li>
<li><a href="#trunkSourceWTFwtftextStringBuildercpp">trunk/Source/WTF/wtf/text/StringBuilder.cpp</a></li>
<li><a href="#trunkSourceWTFwtftextStringBuilderh">trunk/Source/WTF/wtf/text/StringBuilder.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomRangecpp">trunk/Source/WebCore/dom/Range.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingEditingcpp">trunk/Source/WebCore/editing/Editing.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingMarkupAccumulatorcpp">trunk/Source/WebCore/editing/MarkupAccumulator.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingTextIteratorcpp">trunk/Source/WebCore/editing/TextIterator.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTextFormControlElementcpp">trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlparserHTMLTokenizercpp">trunk/Source/WebCore/html/parser/HTMLTokenizer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationInbandTextTrackPrivateAVFcpp">trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformtextSegmentedStringcpp">trunk/Source/WebCore/platform/text/SegmentedString.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformtextTextCodecICUcpp">trunk/Source/WebCore/platform/text/TextCodecICU.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformwpeRenderThemeWPEcpp">trunk/Source/WebCore/platform/wpe/RenderThemeWPE.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeGtkcpp">trunk/Source/WebCore/rendering/RenderThemeGtk.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlXSLTProcessorLibxsltcpp">trunk/Source/WebCore/xml/XSLTProcessorLibxslt.cpp</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitSharedmacAuxiliaryProcessMacmm">trunk/Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessWebProcessPoolcpp">trunk/Source/WebKit/UIProcess/WebProcessPool.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFStringBuildercpp">trunk/Tools/TestWebKitAPI/Tests/WTF/StringBuilder.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitGLibTestWebKitWebContextcpp">trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitWebContext.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (248551 => 248552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog    2019-08-12 22:26:53 UTC (rev 248551)
+++ trunk/Source/JavaScriptCore/ChangeLog       2019-08-12 23:09:06 UTC (rev 248552)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2019-08-12  Sam Weinig  <weinig@apple.com>
+
+        Replace multiparameter overloads of append() in StringBuilder as a first step toward standardizinging on the flexibleAppend() implementation
+        https://bugs.webkit.org/show_bug.cgi?id=200614
+
+        Reviewed by Darin Adler.
+
+        Renames StringBuilder::append(const LChar*, unsigned), StringBuilder::append(const UChar*, unsigned) and 
+        StringBuilder::append(const char*, unsigned) to StringBuilder::appendCharacters(...).
+        
+        Renames StringBuilder::append(const String& string, unsigned offset, unsigned length) to 
+        StringBuilder::appendSubstring(...).
+
+        * dfg/DFGStrengthReductionPhase.cpp:
+        (JSC::DFG::StrengthReductionPhase::handleNode):
+        * runtime/ConfigFile.cpp:
+        (JSC::ConfigFile::parse):
+        * runtime/LiteralParser.cpp:
+        (JSC::LiteralParser<CharType>::Lexer::lexStringSlow):
+        * tools/FunctionOverrides.cpp:
+        (JSC::parseClause):
+        Update for renames.
+
</ins><span class="cx"> 2019-08-12  Adrian Perez de Castro  <aperez@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [WPE][GTK] Fix building without unified sources
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGStrengthReductionPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGStrengthReductionPhase.cpp (248551 => 248552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGStrengthReductionPhase.cpp    2019-08-12 22:26:53 UTC (rev 248551)
+++ trunk/Source/JavaScriptCore/dfg/DFGStrengthReductionPhase.cpp       2019-08-12 23:09:06 UTC (rev 248552)
</span><span class="lines">@@ -854,7 +854,7 @@
</span><span class="cx"> 
</span><span class="cx">                 unsigned replLen = replace.length();
</span><span class="cx">                 if (lastIndex < result.start || replLen) {
</span><del>-                    builder.append(string, lastIndex, result.start - lastIndex);
</del><ins>+                    builder.appendSubstring(string, lastIndex, result.start - lastIndex);
</ins><span class="cx">                     if (replLen) {
</span><span class="cx">                         StringBuilder replacement;
</span><span class="cx">                         substituteBackreferences(replacement, replace, string, ovector.data(), regExp);
</span><span class="lines">@@ -899,7 +899,7 @@
</span><span class="cx">                 m_node->convertToIdentityOn(stringNode);
</span><span class="cx">             else {
</span><span class="cx">                 if (lastIndex < string.length())
</span><del>-                    builder.append(string, lastIndex, string.length() - lastIndex);
</del><ins>+                    builder.appendSubstring(string, lastIndex, string.length() - lastIndex);
</ins><span class="cx">                 
</span><span class="cx">                 m_node->convertToLazyJSConstant(m_graph, LazyJSValue::newString(m_graph, builder.toString()));
</span><span class="cx">             }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeConfigFilecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ConfigFile.cpp (248551 => 248552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ConfigFile.cpp       2019-08-12 22:26:53 UTC (rev 248551)
+++ trunk/Source/JavaScriptCore/runtime/ConfigFile.cpp  2019-08-12 23:09:06 UTC (rev 248552)
</span><span class="lines">@@ -314,7 +314,7 @@
</span><span class="cx">                     while (*p && !isASCIISpace(*p) && *p != '=')
</span><span class="cx">                         p++;
</span><span class="cx"> 
</span><del>-                    builder.append(optionNameStart, p - optionNameStart);
</del><ins>+                    builder.appendCharacters(optionNameStart, p - optionNameStart);
</ins><span class="cx"> 
</span><span class="cx">                     while (*p && isASCIISpace(*p) && *p != '=')
</span><span class="cx">                         p++;
</span><span class="lines">@@ -336,7 +336,7 @@
</span><span class="cx">                     while (*p && !isASCIISpace(*p))
</span><span class="cx">                         p++;
</span><span class="cx"> 
</span><del>-                    builder.append(optionValueStart, p - optionValueStart);
</del><ins>+                    builder.appendCharacters(optionValueStart, p - optionValueStart);
</ins><span class="cx">                     builder.append('\n');
</span><span class="cx"> 
</span><span class="cx">                     while (*p && isASCIISpace(*p))
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeLiteralParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/LiteralParser.cpp (248551 => 248552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/LiteralParser.cpp    2019-08-12 22:26:53 UTC (rev 248551)
+++ trunk/Source/JavaScriptCore/runtime/LiteralParser.cpp       2019-08-12 23:09:06 UTC (rev 248552)
</span><span class="lines">@@ -622,12 +622,12 @@
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         if (!m_builder.isEmpty())
</span><del>-            m_builder.append(runStart, m_ptr - runStart);
</del><ins>+            m_builder.appendCharacters(runStart, m_ptr - runStart);
</ins><span class="cx"> 
</span><span class="cx"> slowPathBegin:
</span><span class="cx">         if ((m_mode != NonStrictJSON) && m_ptr < m_end && *m_ptr == '\\') {
</span><span class="cx">             if (m_builder.isEmpty() && runStart < m_ptr)
</span><del>-                m_builder.append(runStart, m_ptr - runStart);
</del><ins>+                m_builder.appendCharacters(runStart, m_ptr - runStart);
</ins><span class="cx">             ++m_ptr;
</span><span class="cx">             if (m_ptr >= m_end) {
</span><span class="cx">                 m_lexErrorMessage = "Unterminated string"_s;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretoolsFunctionOverridescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tools/FunctionOverrides.cpp (248551 => 248552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tools/FunctionOverrides.cpp  2019-08-12 22:26:53 UTC (rev 248551)
+++ trunk/Source/JavaScriptCore/tools/FunctionOverrides.cpp     2019-08-12 23:09:06 UTC (rev 248552)
</span><span class="lines">@@ -217,7 +217,7 @@
</span><span class="cx">             if (p[strlen(terminator)] != '\n')
</span><span class="cx">                 FAIL_WITH_ERROR(SYNTAX_ERROR, ("Unexpected characters after '", keyword, "' clause end delimiter '", delimiter, "':\n", line, "\n"));
</span><span class="cx"> 
</span><del>-            builder.append(line, p - line + 1);
</del><ins>+            builder.appendCharacters(line, p - line + 1);
</ins><span class="cx">             return builder.toString();
</span><span class="cx">         }
</span><span class="cx">         builder.append(line);
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (248551 => 248552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog       2019-08-12 22:26:53 UTC (rev 248551)
+++ trunk/Source/WTF/ChangeLog  2019-08-12 23:09:06 UTC (rev 248552)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2019-08-12  Sam Weinig  <weinig@apple.com>
+
+        Replace multiparameter overloads of append() in StringBuilder as a first step toward standardizinging on the flexibleAppend() implementation
+        https://bugs.webkit.org/show_bug.cgi?id=200614
+
+        Reviewed by Darin Adler.
+
+        Renames StringBuilder::append(const LChar*, unsigned), StringBuilder::append(const UChar*, unsigned) and 
+        StringBuilder::append(const char*, unsigned) to StringBuilder::appendCharacters(...).
+        
+        Renames StringBuilder::append(const String& string, unsigned offset, unsigned length) to 
+        StringBuilder::appendSubstring(...).
+
+        * wtf/HexNumber.h:
+        (WTF::appendUnsignedAsHexFixedSize):
+        Add overload that explicitly takes a StringBuilder to work around rename from append to appendCharacters.
+
+        * wtf/text/StringBuilder.cpp:
+        (WTF::StringBuilder::appendCharacters):
+        (WTF::StringBuilder::append):
+        * wtf/text/StringBuilder.h:
+        (WTF::StringBuilder::appendCharacters):
+        (WTF::StringBuilder::append):
+        (WTF::StringBuilder::appendSubstring):
+        (WTF::StringBuilder::appendLiteral):
+        (WTF::IntegerToStringConversionTrait<StringBuilder>::flush):
+        Update for renames.
+
</ins><span class="cx"> 2019-08-12  Yusuke Suzuki  <ysuzuki@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [WTF][JSC] Make JSC and WTF aggressively-fast-malloced
</span></span></pre></div>
<a id="trunkSourceWTFwtfHexNumberh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/HexNumber.h (248551 => 248552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/HexNumber.h 2019-08-12 22:26:53 UTC (rev 248551)
+++ trunk/Source/WTF/wtf/HexNumber.h    2019-08-12 23:09:06 UTC (rev 248552)
</span><span class="lines">@@ -21,6 +21,7 @@
</span><span class="cx"> #pragma once
</span><span class="cx"> 
</span><span class="cx"> #include <array>
</span><ins>+#include <wtf/text/StringBuilder.h>
</ins><span class="cx"> #include <wtf/text/StringConcatenate.h>
</span><span class="cx"> 
</span><span class="cx"> namespace WTF {
</span><span class="lines">@@ -72,6 +73,17 @@
</span><span class="cx">     destination.append(result.first, result.second);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+// FIXME: Consider renaming to appendHex.
+// Same as appendUnsignedAsHex, but zero-padding to get at least the desired number of digits.
+template<typename NumberType>
+inline void appendUnsignedAsHexFixedSize(NumberType number, StringBuilder& destination, unsigned minimumDigits, HexConversionMode mode = Uppercase)
+{
+    // Each byte can generate up to two digits.
+    std::array<LChar, sizeof(NumberType) * 2> buffer;
+    auto result = Internal::appendHex(buffer, number, minimumDigits, mode);
+    destination.appendCharacters(result.first, result.second);
+}
+
</ins><span class="cx"> struct HexNumberBuffer {
</span><span class="cx">     WTF_MAKE_STRUCT_FAST_ALLOCATED;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWTFwtftextStringBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringBuilder.cpp (248551 => 248552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringBuilder.cpp      2019-08-12 22:26:53 UTC (rev 248551)
+++ trunk/Source/WTF/wtf/text/StringBuilder.cpp 2019-08-12 23:09:06 UTC (rev 248552)
</span><span class="lines">@@ -303,7 +303,7 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void StringBuilder::append(const UChar* characters, unsigned length)
</del><ins>+void StringBuilder::appendCharacters(const UChar* characters, unsigned length)
</ins><span class="cx"> {
</span><span class="cx">     if (!length || hasOverflowed())
</span><span class="cx">         return;
</span><span class="lines">@@ -314,7 +314,7 @@
</span><span class="cx">         if (length == 1 && !(*characters & ~0xff)) {
</span><span class="cx">             // Append as 8 bit character
</span><span class="cx">             LChar lChar = static_cast<LChar>(*characters);
</span><del>-            return append(&lChar, 1);
</del><ins>+            return appendCharacters(&lChar, 1);
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         // Calculate the new size of the builder after appending.
</span><span class="lines">@@ -345,7 +345,7 @@
</span><span class="cx">     ASSERT(m_buffer->length() >= m_length.unsafeGet<unsigned>());
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void StringBuilder::append(const LChar* characters, unsigned length)
</del><ins>+void StringBuilder::appendCharacters(const LChar* characters, unsigned length)
</ins><span class="cx"> {
</span><span class="cx">     if (!length || hasOverflowed())
</span><span class="cx">         return;
</span><span class="lines">@@ -383,7 +383,7 @@
</span><span class="cx"> {
</span><span class="cx">     // Fast path: avoid constructing a temporary String when possible.
</span><span class="cx">     if (auto* characters = CFStringGetCStringPtr(string, kCFStringEncodingISOLatin1)) {
</span><del>-        append(reinterpret_cast<const LChar*>(characters), CFStringGetLength(string));
</del><ins>+        appendCharacters(reinterpret_cast<const LChar*>(characters), CFStringGetLength(string));
</ins><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx">     append(String(string));
</span></span></pre></div>
<a id="trunkSourceWTFwtftextStringBuilderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringBuilder.h (248551 => 248552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringBuilder.h        2019-08-12 22:26:53 UTC (rev 248551)
+++ trunk/Source/WTF/wtf/text/StringBuilder.h   2019-08-12 23:09:06 UTC (rev 248552)
</span><span class="lines">@@ -69,10 +69,10 @@
</span><span class="cx">     ALWAYS_INLINE bool hasOverflowed() const { return m_length.hasOverflowed(); }
</span><span class="cx">     ALWAYS_INLINE bool crashesOnOverflow() const { return m_length.shouldCrashOnOverflow(); }
</span><span class="cx"> 
</span><del>-    WTF_EXPORT_PRIVATE void append(const UChar*, unsigned);
-    WTF_EXPORT_PRIVATE void append(const LChar*, unsigned);
</del><ins>+    WTF_EXPORT_PRIVATE void appendCharacters(const UChar*, unsigned);
+    WTF_EXPORT_PRIVATE void appendCharacters(const LChar*, unsigned);
</ins><span class="cx"> 
</span><del>-    ALWAYS_INLINE void append(const char* characters, unsigned length) { append(reinterpret_cast<const LChar*>(characters), length); }
</del><ins>+    ALWAYS_INLINE void appendCharacters(const char* characters, unsigned length) { appendCharacters(reinterpret_cast<const LChar*>(characters), length); }
</ins><span class="cx"> 
</span><span class="cx">     void append(const AtomString& atomString)
</span><span class="cx">     {
</span><span class="lines">@@ -97,9 +97,9 @@
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         if (string.is8Bit())
</span><del>-            append(string.characters8(), string.length());
</del><ins>+            appendCharacters(string.characters8(), string.length());
</ins><span class="cx">         else
</span><del>-            append(string.characters16(), string.length());
</del><ins>+            appendCharacters(string.characters16(), string.length());
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     void append(const StringBuilder& other)
</span><span class="lines">@@ -122,17 +122,17 @@
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         if (other.is8Bit())
</span><del>-            append(other.characters8(), other.m_length.unsafeGet());
</del><ins>+            appendCharacters(other.characters8(), other.m_length.unsafeGet());
</ins><span class="cx">         else
</span><del>-            append(other.characters16(), other.m_length.unsafeGet());
</del><ins>+            appendCharacters(other.characters16(), other.m_length.unsafeGet());
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     void append(StringView stringView)
</span><span class="cx">     {
</span><span class="cx">         if (stringView.is8Bit())
</span><del>-            append(stringView.characters8(), stringView.length());
</del><ins>+            appendCharacters(stringView.characters8(), stringView.length());
</ins><span class="cx">         else
</span><del>-            append(stringView.characters16(), stringView.length());
</del><ins>+            appendCharacters(stringView.characters16(), stringView.length());
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx"> #if USE(CF)
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx">     void append(NSString *string) { append((__bridge CFStringRef)string); }
</span><span class="cx"> #endif
</span><span class="cx">     
</span><del>-    void append(const String& string, unsigned offset, unsigned length)
</del><ins>+    void appendSubstring(const String& string, unsigned offset, unsigned length)
</ins><span class="cx">     {
</span><span class="cx">         if (!string.length())
</span><span class="cx">             return;
</span><span class="lines">@@ -151,15 +151,15 @@
</span><span class="cx">             return;
</span><span class="cx"> 
</span><span class="cx">         if (string.is8Bit())
</span><del>-            append(string.characters8() + offset, length);
</del><ins>+            appendCharacters(string.characters8() + offset, length);
</ins><span class="cx">         else
</span><del>-            append(string.characters16() + offset, length);
</del><ins>+            appendCharacters(string.characters16() + offset, length);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     void append(const char* characters)
</span><span class="cx">     {
</span><span class="cx">         if (characters)
</span><del>-            append(characters, strlen(characters));
</del><ins>+            appendCharacters(characters, strlen(characters));
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     void append(UChar c)
</span><span class="lines">@@ -180,7 +180,7 @@
</span><span class="cx">                 return;
</span><span class="cx">             }
</span><span class="cx">         }
</span><del>-        append(&c, 1);
</del><ins>+        appendCharacters(&c, 1);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     void append(LChar c)
</span><span class="lines">@@ -195,7 +195,7 @@
</span><span class="cx">                 m_bufferCharacters16[length] = c;
</span><span class="cx">             m_length++;
</span><span class="cx">         } else
</span><del>-            append(&c, 1);
</del><ins>+            appendCharacters(&c, 1);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     void append(char c)
</span><span class="lines">@@ -216,7 +216,7 @@
</span><span class="cx">     WTF_EXPORT_PRIVATE void appendQuotedJSONString(const String&);
</span><span class="cx"> 
</span><span class="cx">     template<unsigned characterCount>
</span><del>-    ALWAYS_INLINE void appendLiteral(const char (&characters)[characterCount]) { append(characters, characterCount - 1); }
</del><ins>+    ALWAYS_INLINE void appendLiteral(const char (&characters)[characterCount]) { appendCharacters(characters, characterCount - 1); }
</ins><span class="cx"> 
</span><span class="cx">     WTF_EXPORT_PRIVATE void appendNumber(int);
</span><span class="cx">     WTF_EXPORT_PRIVATE void appendNumber(unsigned);
</span><span class="lines">@@ -469,7 +469,7 @@
</span><span class="cx"> template<> struct IntegerToStringConversionTrait<StringBuilder> {
</span><span class="cx">     using ReturnType = void;
</span><span class="cx">     using AdditionalArgumentType = StringBuilder;
</span><del>-    static void flush(LChar* characters, unsigned length, StringBuilder* stringBuilder) { stringBuilder->append(characters, length); }
</del><ins>+    static void flush(LChar* characters, unsigned length, StringBuilder* stringBuilder) { stringBuilder->appendCharacters(characters, length); }
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WTF
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (248551 => 248552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-08-12 22:26:53 UTC (rev 248551)
+++ trunk/Source/WebCore/ChangeLog      2019-08-12 23:09:06 UTC (rev 248552)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2019-08-12  Sam Weinig  <weinig@apple.com>
+
+        Replace multiparameter overloads of append() in StringBuilder as a first step toward standardizinging on the flexibleAppend() implementation
+        https://bugs.webkit.org/show_bug.cgi?id=200614
+
+        Reviewed by Darin Adler.
+
+        Renames StringBuilder::append(const LChar*, unsigned), StringBuilder::append(const UChar*, unsigned) and 
+        StringBuilder::append(const char*, unsigned) to StringBuilder::appendCharacters(...).
+        
+        Renames StringBuilder::append(const String& string, unsigned offset, unsigned length) to 
+        StringBuilder::appendSubstring(...).
+
+        * dom/Range.cpp:
+        (WebCore::Range::toString const):
+        * editing/Editing.cpp:
+        (WebCore::stringWithRebalancedWhitespace):
+        * editing/MarkupAccumulator.cpp:
+        (WebCore::appendCharactersReplacingEntitiesInternal):
+        * editing/TextIterator.cpp:
+        (WebCore::TextIteratorCopyableText::appendToStringBuilder const):
+        * html/HTMLTextFormControlElement.cpp:
+        (WebCore::HTMLTextFormControlElement::valueWithHardLineBreaks const):
+        * html/parser/HTMLTokenizer.cpp:
+        (WebCore::HTMLTokenizer::bufferedCharacters const):
+        * platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp:
+        (WebCore::InbandTextTrackPrivateAVF::processNativeSamples):
+        * platform/text/SegmentedString.cpp:
+        (WebCore::SegmentedString::Substring::appendTo const):
+        * platform/text/TextCodecICU.cpp:
+        (WebCore::TextCodecICU::decode):
+        * xml/XSLTProcessorLibxslt.cpp:
+        (WebCore::writeToStringBuilder):
+        Update for renames.
+
</ins><span class="cx"> 2019-08-12  Adrian Perez de Castro  <aperez@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [WPE][GTK] Fix building without unified sources
</span></span></pre></div>
<a id="trunkSourceWebCoredomRangecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Range.cpp (248551 => 248552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Range.cpp       2019-08-12 22:26:53 UTC (rev 248551)
+++ trunk/Source/WebCore/dom/Range.cpp  2019-08-12 23:09:06 UTC (rev 248552)
</span><span class="lines">@@ -946,7 +946,7 @@
</span><span class="cx">             unsigned length = data.length();
</span><span class="cx">             unsigned start = node == &startContainer() ? std::min(m_start.offset(), length) : 0U;
</span><span class="cx">             unsigned end = node == &endContainer() ? std::min(std::max(start, m_end.offset()), length) : length;
</span><del>-            builder.append(data, start, end - start);
</del><ins>+            builder.appendSubstring(data, start, end - start);
</ins><span class="cx">         }
</span><span class="cx">     }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editing.cpp (248551 => 248552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editing.cpp 2019-08-12 22:26:53 UTC (rev 248551)
+++ trunk/Source/WebCore/editing/Editing.cpp    2019-08-12 23:09:06 UTC (rev 248552)
</span><span class="lines">@@ -420,7 +420,7 @@
</span><span class="cx">         if (character == selectedWhitespaceCharacter)
</span><span class="cx">             continue;
</span><span class="cx">         rebalancedString.reserveCapacity(length);
</span><del>-        rebalancedString.append(string, rebalancedString.length(), i - rebalancedString.length());
</del><ins>+        rebalancedString.appendSubstring(string, rebalancedString.length(), i - rebalancedString.length());
</ins><span class="cx">         rebalancedString.append(selectedWhitespaceCharacter);
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -428,7 +428,7 @@
</span><span class="cx">         return string;
</span><span class="cx"> 
</span><span class="cx">     rebalancedString.reserveCapacity(length);
</span><del>-    rebalancedString.append(string, rebalancedString.length(), length - rebalancedString.length());
</del><ins>+    rebalancedString.appendSubstring(string, rebalancedString.length(), length - rebalancedString.length());
</ins><span class="cx">     return rebalancedString.toString();
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingMarkupAccumulatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/MarkupAccumulator.cpp (248551 => 248552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/MarkupAccumulator.cpp       2019-08-12 22:26:53 UTC (rev 248551)
+++ trunk/Source/WebCore/editing/MarkupAccumulator.cpp  2019-08-12 23:09:06 UTC (rev 248552)
</span><span class="lines">@@ -150,12 +150,12 @@
</span><span class="cx">         CharacterType character = text[i];
</span><span class="cx">         uint8_t substitution = character < WTF_ARRAY_LENGTH(entityMap) ? entityMap[character] : static_cast<uint8_t>(EntitySubstitutionNullIndex);
</span><span class="cx">         if (UNLIKELY(substitution != EntitySubstitutionNullIndex) && entitySubstitutionList[substitution].mask & entityMask) {
</span><del>-            result.append(text + positionAfterLastEntity, i - positionAfterLastEntity);
-            result.append(entitySubstitutionList[substitution].characters, entitySubstitutionList[substitution].length);
</del><ins>+            result.appendCharacters(text + positionAfterLastEntity, i - positionAfterLastEntity);
+            result.appendCharacters(entitySubstitutionList[substitution].characters, entitySubstitutionList[substitution].length);
</ins><span class="cx">             positionAfterLastEntity = i + 1;
</span><span class="cx">         }
</span><span class="cx">     }
</span><del>-    result.append(text + positionAfterLastEntity, length - positionAfterLastEntity);
</del><ins>+    result.appendCharacters(text + positionAfterLastEntity, length - positionAfterLastEntity);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void MarkupAccumulator::appendCharactersReplacingEntities(StringBuilder& result, const String& source, unsigned offset, unsigned length, EntityMask entityMask)
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingTextIteratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/TextIterator.cpp (248551 => 248552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/TextIterator.cpp    2019-08-12 22:26:53 UTC (rev 248551)
+++ trunk/Source/WebCore/editing/TextIterator.cpp       2019-08-12 23:09:06 UTC (rev 248552)
</span><span class="lines">@@ -335,7 +335,7 @@
</span><span class="cx">     if (m_singleCharacter)
</span><span class="cx">         builder.append(m_singleCharacter);
</span><span class="cx">     else
</span><del>-        builder.append(m_string, m_offset, m_length);
</del><ins>+        builder.appendSubstring(m_string, m_offset, m_length);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> // --------
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTextFormControlElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp (248551 => 248552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp 2019-08-12 22:26:53 UTC (rev 248551)
+++ trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp    2019-08-12 23:09:06 UTC (rev 248552)
</span><span class="lines">@@ -717,13 +717,13 @@
</span><span class="cx">             unsigned position = 0;
</span><span class="cx">             while (breakNode == node && breakOffset <= length) {
</span><span class="cx">                 if (breakOffset > position) {
</span><del>-                    result.append(data, position, breakOffset - position);
</del><ins>+                    result.appendSubstring(data, position, breakOffset - position);
</ins><span class="cx">                     position = breakOffset;
</span><span class="cx">                     result.append(newlineCharacter);
</span><span class="cx">                 }
</span><span class="cx">                 getNextSoftBreak(line, breakNode, breakOffset);
</span><span class="cx">             }
</span><del>-            result.append(data, position, length - position);
</del><ins>+            result.appendSubstring(data, position, length - position);
</ins><span class="cx">         }
</span><span class="cx">         while (breakNode == node)
</span><span class="cx">             getNextSoftBreak(line, breakNode, breakOffset);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLTokenizercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLTokenizer.cpp (248551 => 248552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLTokenizer.cpp       2019-08-12 22:26:53 UTC (rev 248551)
+++ trunk/Source/WebCore/html/parser/HTMLTokenizer.cpp  2019-08-12 23:09:06 UTC (rev 248552)
</span><span class="lines">@@ -1401,7 +1401,7 @@
</span><span class="cx">     characters.reserveCapacity(numberOfBufferedCharacters());
</span><span class="cx">     characters.append('<');
</span><span class="cx">     characters.append('/');
</span><del>-    characters.append(m_temporaryBuffer.data(), m_temporaryBuffer.size());
</del><ins>+    characters.appendCharacters(m_temporaryBuffer.data(), m_temporaryBuffer.size());
</ins><span class="cx">     return characters.toString();
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationInbandTextTrackPrivateAVFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp (248551 => 248552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp        2019-08-12 22:26:53 UTC (rev 248551)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp   2019-08-12 23:09:06 UTC (rev 248552)
</span><span class="lines">@@ -529,7 +529,7 @@
</span><span class="cx">             // A WebVTT header is terminated by "One or more WebVTT line terminators" so append two line feeds to make sure the parser
</span><span class="cx">             // reccognized this string as a full header.
</span><span class="cx">             StringBuilder header;
</span><del>-            header.append(reinterpret_cast<const unsigned char*>(CFDataGetBytePtr(webvttHeaderData)), length);
</del><ins>+            header.appendCharacters(reinterpret_cast<const unsigned char*>(CFDataGetBytePtr(webvttHeaderData)), length);
</ins><span class="cx">             header.append("\n\n");
</span><span class="cx"> 
</span><span class="cx">             INFO_LOG(LOGIDENTIFIER, "VTT header ", &header);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextSegmentedStringcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/SegmentedString.cpp (248551 => 248552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/SegmentedString.cpp   2019-08-12 22:26:53 UTC (rev 248551)
+++ trunk/Source/WebCore/platform/text/SegmentedString.cpp      2019-08-12 23:09:06 UTC (rev 248552)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> 
</span><span class="cx"> inline void SegmentedString::Substring::appendTo(StringBuilder& builder) const
</span><span class="cx"> {
</span><del>-    builder.append(string, string.length() - length, length);
</del><ins>+    builder.appendSubstring(string, string.length() - length, length);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> SegmentedString& SegmentedString::operator=(SegmentedString&& other)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextTextCodecICUcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/TextCodecICU.cpp (248551 => 248552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/TextCodecICU.cpp      2019-08-12 22:26:53 UTC (rev 248551)
+++ trunk/Source/WebCore/platform/text/TextCodecICU.cpp 2019-08-12 23:09:06 UTC (rev 248552)
</span><span class="lines">@@ -307,7 +307,7 @@
</span><span class="cx"> 
</span><span class="cx">     do {
</span><span class="cx">         int ucharsDecoded = decodeToBuffer(buffer, bufferLimit, source, sourceLimit, offsets, flush, err);
</span><del>-        result.append(buffer, ucharsDecoded);
</del><ins>+        result.appendCharacters(buffer, ucharsDecoded);
</ins><span class="cx">     } while (err == U_BUFFER_OVERFLOW_ERROR);
</span><span class="cx"> 
</span><span class="cx">     if (U_FAILURE(err)) {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwpeRenderThemeWPEcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/wpe/RenderThemeWPE.cpp (248551 => 248552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/wpe/RenderThemeWPE.cpp     2019-08-12 22:26:53 UTC (rev 248551)
+++ trunk/Source/WebCore/platform/wpe/RenderThemeWPE.cpp        2019-08-12 23:09:06 UTC (rev 248552)
</span><span class="lines">@@ -58,8 +58,8 @@
</span><span class="cx"> String RenderThemeWPE::mediaControlsScript()
</span><span class="cx"> {
</span><span class="cx">     StringBuilder scriptBuilder;
</span><del>-    scriptBuilder.append(mediaControlsLocalizedStringsJavaScript, sizeof(mediaControlsLocalizedStringsJavaScript));
-    scriptBuilder.append(mediaControlsBaseJavaScript, sizeof(mediaControlsBaseJavaScript));
</del><ins>+    scriptBuilder.appendCharacters(mediaControlsLocalizedStringsJavaScript, sizeof(mediaControlsLocalizedStringsJavaScript));
+    scriptBuilder.appendCharacters(mediaControlsBaseJavaScript, sizeof(mediaControlsBaseJavaScript));
</ins><span class="cx">     return scriptBuilder.toString();
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeGtk.cpp (248551 => 248552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeGtk.cpp        2019-08-12 22:26:53 UTC (rev 248551)
+++ trunk/Source/WebCore/rendering/RenderThemeGtk.cpp   2019-08-12 23:09:06 UTC (rev 248552)
</span><span class="lines">@@ -1212,9 +1212,9 @@
</span><span class="cx"> String RenderThemeGtk::mediaControlsScript()
</span><span class="cx"> {
</span><span class="cx">     StringBuilder scriptBuilder;
</span><del>-    scriptBuilder.append(mediaControlsLocalizedStringsJavaScript, sizeof(mediaControlsLocalizedStringsJavaScript));
-    scriptBuilder.append(mediaControlsBaseJavaScript, sizeof(mediaControlsBaseJavaScript));
-    scriptBuilder.append(mediaControlsGtkJavaScript, sizeof(mediaControlsGtkJavaScript));
</del><ins>+    scriptBuilder.appendCharacters(mediaControlsLocalizedStringsJavaScript, sizeof(mediaControlsLocalizedStringsJavaScript));
+    scriptBuilder.appendCharacters(mediaControlsBaseJavaScript, sizeof(mediaControlsBaseJavaScript));
+    scriptBuilder.appendCharacters(mediaControlsGtkJavaScript, sizeof(mediaControlsGtkJavaScript));
</ins><span class="cx">     return scriptBuilder.toString();
</span><span class="cx"> }
</span><span class="cx"> #endif // ENABLE(VIDEO)
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXSLTProcessorLibxsltcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XSLTProcessorLibxslt.cpp (248551 => 248552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XSLTProcessorLibxslt.cpp        2019-08-12 22:26:53 UTC (rev 248551)
+++ trunk/Source/WebCore/xml/XSLTProcessorLibxslt.cpp   2019-08-12 23:09:06 UTC (rev 248552)
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx">         }
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    resultOutput.append(outputBuffer.data(), outputOffset);
</del><ins>+    resultOutput.appendCharacters(outputBuffer.data(), outputOffset);
</ins><span class="cx">     return inputOffset;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (248551 => 248552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2019-08-12 22:26:53 UTC (rev 248551)
+++ trunk/Source/WebKit/ChangeLog       2019-08-12 23:09:06 UTC (rev 248552)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2019-08-12  Sam Weinig  <weinig@apple.com>
+
+        Replace multiparameter overloads of append() in StringBuilder as a first step toward standardizinging on the flexibleAppend() implementation
+        https://bugs.webkit.org/show_bug.cgi?id=200614
+
+        Reviewed by Darin Adler.
+
+        Renames StringBuilder::append(const LChar*, unsigned), StringBuilder::append(const UChar*, unsigned) and 
+        StringBuilder::append(const char*, unsigned) to StringBuilder::appendCharacters(...).
+        
+        Renames StringBuilder::append(const String& string, unsigned offset, unsigned length) to 
+        StringBuilder::appendSubstring(...).
+
+        * Shared/mac/AuxiliaryProcessMac.mm:
+        (WebKit::setAndSerializeSandboxParameters):
+        * UIProcess/WebProcessPool.cpp:
+        (WebKit::WebProcessPool::didReceiveInvalidMessage):
+        Update for renames.
+
</ins><span class="cx"> 2019-08-12  Dean Jackson  <dino@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Contextual menu Hide and Show Link Previews should not have a symbol
</span></span></pre></div>
<a id="trunkSourceWebKitSharedmacAuxiliaryProcessMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm (248551 => 248552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm    2019-08-12 22:26:53 UTC (rev 248551)
+++ trunk/Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm       2019-08-12 23:09:06 UTC (rev 248552)
</span><span class="lines">@@ -234,9 +234,9 @@
</span><span class="cx">             WTFLogAlways("%s: Could not set sandbox parameter: %s\n", getprogname(), strerror(errno));
</span><span class="cx">             CRASH();
</span><span class="cx">         }
</span><del>-        builder.append(name, strlen(name));
</del><ins>+        builder.append(name);
</ins><span class="cx">         builder.append(':');
</span><del>-        builder.append(value, strlen(value));
</del><ins>+        builder.append(value);
</ins><span class="cx">         builder.append(':');
</span><span class="cx">     }
</span><span class="cx">     if (isProfilePath) {
</span><span class="lines">@@ -243,7 +243,7 @@
</span><span class="cx">         auto contents = fileContents(profileOrProfilePath);
</span><span class="cx">         if (!contents)
</span><span class="cx">             return WTF::nullopt;
</span><del>-        builder.append(contents->data(), contents->size());
</del><ins>+        builder.appendCharacters(contents->data(), contents->size());
</ins><span class="cx">     } else
</span><span class="cx">         builder.append(profileOrProfilePath);
</span><span class="cx">     return builder.toString().ascii();
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessWebProcessPoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.cpp (248551 => 248552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2019-08-12 22:26:53 UTC (rev 248551)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.cpp    2019-08-12 23:09:06 UTC (rev 248552)
</span><span class="lines">@@ -792,9 +792,9 @@
</span><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     StringBuilder messageNameStringBuilder;
</span><del>-    messageNameStringBuilder.append(messageReceiverName.data(), messageReceiverName.size());
</del><ins>+    messageNameStringBuilder.appendCharacters(messageReceiverName.data(), messageReceiverName.size());
</ins><span class="cx">     messageNameStringBuilder.append('.');
</span><del>-    messageNameStringBuilder.append(messageName.data(), messageName.size());
</del><ins>+    messageNameStringBuilder.appendCharacters(messageName.data(), messageName.size());
</ins><span class="cx"> 
</span><span class="cx">     s_invalidMessageCallback(toAPI(API::String::create(messageNameStringBuilder.toString()).ptr()));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (248551 => 248552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2019-08-12 22:26:53 UTC (rev 248551)
+++ trunk/Tools/ChangeLog       2019-08-12 23:09:06 UTC (rev 248552)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2019-08-12  Sam Weinig  <weinig@apple.com>
+
+        Replace multiparameter overloads of append() in StringBuilder as a first step toward standardizinging on the flexibleAppend() implementation
+        https://bugs.webkit.org/show_bug.cgi?id=200614
+
+        Reviewed by Darin Adler.
+
+        Renames StringBuilder::append(const LChar*, unsigned), StringBuilder::append(const UChar*, unsigned) and 
+        StringBuilder::append(const char*, unsigned) to StringBuilder::appendCharacters(...).
+        
+        Renames StringBuilder::append(const String& string, unsigned offset, unsigned length) to 
+        StringBuilder::appendSubstring(...).
+
+        * TestWebKitAPI/Tests/WTF/StringBuilder.cpp:
+        (TestWebKitAPI::TEST):
+        Update for renames.
+
</ins><span class="cx"> 2019-08-12  Megan Gardner  <megan_gardner@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Fix Crash in Mail Search
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFStringBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/StringBuilder.cpp (248551 => 248552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/StringBuilder.cpp    2019-08-12 22:26:53 UTC (rev 248551)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/StringBuilder.cpp       2019-08-12 23:09:06 UTC (rev 248552)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx">     expectBuilderContent("0123456789", builder);
</span><span class="cx">     builder.append("abcd");
</span><span class="cx">     expectBuilderContent("0123456789abcd", builder);
</span><del>-    builder.append("efgh", 3);
</del><ins>+    builder.appendCharacters("efgh", 3);
</ins><span class="cx">     expectBuilderContent("0123456789abcdefg", builder);
</span><span class="cx">     builder.append("");
</span><span class="cx">     expectBuilderContent("0123456789abcdefg", builder);
</span><span class="lines">@@ -73,11 +73,11 @@
</span><span class="cx"> 
</span><span class="cx">     builder.toString(); // Test after reifyString().
</span><span class="cx">     StringBuilder builder1;
</span><del>-    builder.append("", 0);
</del><ins>+    builder.appendCharacters("", 0);
</ins><span class="cx">     expectBuilderContent("0123456789abcdefg#", builder);
</span><del>-    builder1.append(builder.characters8(), builder.length());
</del><ins>+    builder1.appendCharacters(builder.characters8(), builder.length());
</ins><span class="cx">     builder1.append("XYZ");
</span><del>-    builder.append(builder1.characters8(), builder1.length());
</del><ins>+    builder.appendCharacters(builder1.characters8(), builder1.length());
</ins><span class="cx">     expectBuilderContent("0123456789abcdefg#0123456789abcdefg#XYZ", builder);
</span><span class="cx"> 
</span><span class="cx">     StringBuilder builder2;
</span><span class="lines">@@ -104,12 +104,12 @@
</span><span class="cx">         StringBuilder builder2;
</span><span class="cx">         UChar32 frakturAChar = 0x1D504;
</span><span class="cx">         const UChar data[] = { U16_LEAD(frakturAChar), U16_TRAIL(frakturAChar) };
</span><del>-        builder2.append(data, 2);
</del><ins>+        builder2.appendCharacters(data, 2);
</ins><span class="cx">         ASSERT_EQ(2U, builder2.length());
</span><span class="cx">         String result2 = builder2.toString();
</span><span class="cx">         ASSERT_EQ(2U, result2.length());
</span><span class="cx">         builder.append(builder2);
</span><del>-        builder.append(data, 2);
</del><ins>+        builder.appendCharacters(data, 2);
</ins><span class="cx">         ASSERT_EQ(4U, builder.length());
</span><span class="cx">         const UChar resultArray[] = { U16_LEAD(frakturAChar), U16_TRAIL(frakturAChar), U16_LEAD(frakturAChar), U16_TRAIL(frakturAChar) };
</span><span class="cx">         expectBuilderContent(String(resultArray, WTF_ARRAY_LENGTH(resultArray)), builder);
</span><span class="lines">@@ -360,7 +360,7 @@
</span><span class="cx">     }
</span><span class="cx">     { // AtomString constructed from an empty char* string.
</span><span class="cx">         StringBuilder builder;
</span><del>-        builder.append("", 0);
</del><ins>+        builder.appendCharacters("", 0);
</ins><span class="cx">         AtomString atomString = builder.toAtomString();
</span><span class="cx">         ASSERT_EQ(emptyAtom(), atomString);
</span><span class="cx">     }
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitGLibTestWebKitWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitWebContext.cpp (248551 => 248552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitWebContext.cpp      2019-08-12 22:26:53 UTC (rev 248551)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitWebContext.cpp 2019-08-12 23:09:06 UTC (rev 248552)
</span><span class="lines">@@ -271,7 +271,7 @@
</span><span class="cx">     builder.append("<html><body>");
</span><span class="cx"> 
</span><span class="cx">     if (contentLength <= baseLength)
</span><del>-        builder.append(baseString, 0, contentLength);
</del><ins>+        builder.appendSubstring(baseString, 0, contentLength);
</ins><span class="cx">     else {
</span><span class="cx">         unsigned currentLength = 0;
</span><span class="cx">         while (currentLength < contentLength) {
</span><span class="lines">@@ -278,7 +278,7 @@
</span><span class="cx">             if ((currentLength + baseLength) <= contentLength)
</span><span class="cx">                 builder.append(baseString);
</span><span class="cx">             else
</span><del>-                builder.append(baseString, 0, contentLength - currentLength);
</del><ins>+                builder.appendSubstring(baseString, 0, contentLength - currentLength);
</ins><span class="cx"> 
</span><span class="cx">             // Account for the 12 characters of the '<html><body>' prefix.
</span><span class="cx">             currentLength = builder.length() - 12;
</span></span></pre>
</div>
</div>

</body>
</html>