<!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>[190882] trunk/Source</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/190882">190882</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2015-10-12 12:44:52 -0700 (Mon, 12 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>"A + B" with strings shouldn't copy if A or B is empty.
<https://webkit.org/b/150034>
Reviewed by Anders Carlsson.
Source/JavaScriptCore:
* runtime/JSStringBuilder.h:
(JSC::jsMakeNontrivialString):
* runtime/Lookup.cpp:
(JSC::reifyStaticAccessor):
* runtime/ObjectPrototype.cpp:
(JSC::objectProtoFuncToString):
Source/WTF:
Add a fast path to WTF's operator+ magic for concatenation of two strings where
one of them is empty. In that case, try to avoid allocation altogether by returning
the non-empty string.
Spotted this while analyzing memory peaks during page load; it turns out we were
duplicating whole text resources (JS, CSS) at the end of decoding, below
TextResourceDecoder::decodeAndFlush(). That function effectively does:
return decode() + flush();
Very often, flush() returns an empty string, so due to the naive operator+,
we'd allocate a new StringImpl of length (decode().length() + flush().length())
and copy the return value from decode() into it. So silly!
Had to make the tryMakeString() machinery use String as a return type instead of
RefPtr<StringImpl> to make all the right overloads gel. StringTypeAdapter templates
are now required to provide a toString() function.
* wtf/text/StringConcatenate.h:
(WTF::StringTypeAdapter<char>::toString):
(WTF::StringTypeAdapter<UChar>::toString):
(WTF::StringTypeAdapter<Vector<char>>::toString):
(WTF::StringTypeAdapter<String>::toString):
(WTF::tryMakeString):
(WTF::makeString):
* wtf/text/StringOperators.h:
(WTF::StringAppend::operator String):
* wtf/text/StringView.h:
(WTF::StringTypeAdapter<StringView>::toString):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSStringBuilderh">trunk/Source/JavaScriptCore/runtime/JSStringBuilder.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeLookupcpp">trunk/Source/JavaScriptCore/runtime/Lookup.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeObjectPrototypecpp">trunk/Source/JavaScriptCore/runtime/ObjectPrototype.cpp</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtftextStringConcatenateh">trunk/Source/WTF/wtf/text/StringConcatenate.h</a></li>
<li><a href="#trunkSourceWTFwtftextStringOperatorsh">trunk/Source/WTF/wtf/text/StringOperators.h</a></li>
<li><a href="#trunkSourceWTFwtftextStringViewh">trunk/Source/WTF/wtf/text/StringView.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (190881 => 190882)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-10-12 19:36:03 UTC (rev 190881)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-10-12 19:44:52 UTC (rev 190882)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-10-12 Andreas Kling <akling@apple.com>
+
+ "A + B" with strings shouldn't copy if A or B is empty.
+ <https://webkit.org/b/150034>
+
+ Reviewed by Anders Carlsson.
+
+ * runtime/JSStringBuilder.h:
+ (JSC::jsMakeNontrivialString):
+ * runtime/Lookup.cpp:
+ (JSC::reifyStaticAccessor):
+ * runtime/ObjectPrototype.cpp:
+ (JSC::objectProtoFuncToString):
+
</ins><span class="cx"> 2015-10-12 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> VisitedValueCount GC Counter misses parallel SlotVisitors
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSStringBuilderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSStringBuilder.h (190881 => 190882)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSStringBuilder.h 2015-10-12 19:36:03 UTC (rev 190881)
+++ trunk/Source/JavaScriptCore/runtime/JSStringBuilder.h 2015-10-12 19:44:52 UTC (rev 190882)
</span><span class="lines">@@ -127,10 +127,10 @@
</span><span class="cx"> template<typename StringType, typename... StringTypes>
</span><span class="cx"> inline JSValue jsMakeNontrivialString(ExecState* exec, const StringType& string, const StringTypes&... strings)
</span><span class="cx"> {
</span><del>- RefPtr<StringImpl> result = WTF::tryMakeString(string, strings...);
</del><ins>+ String result = WTF::tryMakeString(string, strings...);
</ins><span class="cx"> if (!result)
</span><span class="cx"> return throwOutOfMemoryError(exec);
</span><del>- return jsNontrivialString(exec, result.release());
</del><ins>+ return jsNontrivialString(exec, result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeLookupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Lookup.cpp (190881 => 190882)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Lookup.cpp 2015-10-12 19:36:03 UTC (rev 190881)
+++ trunk/Source/JavaScriptCore/runtime/Lookup.cpp 2015-10-12 19:44:52 UTC (rev 190882)
</span><span class="lines">@@ -32,12 +32,12 @@
</span><span class="cx"> JSGlobalObject* globalObject = thisObj.globalObject();
</span><span class="cx"> GetterSetter* accessor = GetterSetter::create(vm, globalObject);
</span><span class="cx"> if (value.accessorGetter()) {
</span><del>- RefPtr<StringImpl> getterName = WTF::tryMakeString(ASCIILiteral("get "), String(*propertyName.publicName()));
</del><ins>+ String getterName = WTF::tryMakeString(ASCIILiteral("get "), String(*propertyName.publicName()));
</ins><span class="cx"> if (!getterName)
</span><span class="cx"> return;
</span><span class="cx"> accessor->setGetter(vm, globalObject, value.attributes() & Builtin
</span><del>- ? JSFunction::createBuiltinFunction(vm, value.builtinAccessorGetterGenerator()(vm), globalObject, *getterName)
- : JSFunction::create(vm, globalObject, 0, *getterName, value.accessorGetter()));
</del><ins>+ ? JSFunction::createBuiltinFunction(vm, value.builtinAccessorGetterGenerator()(vm), globalObject, getterName)
+ : JSFunction::create(vm, globalObject, 0, getterName, value.accessorGetter()));
</ins><span class="cx"> }
</span><span class="cx"> thisObj.putDirectNonIndexAccessor(vm, propertyName, accessor, attributesForStructure(value.attributes()));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeObjectPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ObjectPrototype.cpp (190881 => 190882)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ObjectPrototype.cpp 2015-10-12 19:36:03 UTC (rev 190881)
+++ trunk/Source/JavaScriptCore/runtime/ObjectPrototype.cpp 2015-10-12 19:44:52 UTC (rev 190882)
</span><span class="lines">@@ -245,11 +245,11 @@
</span><span class="cx">
</span><span class="cx"> JSString* result = thisObject->structure(vm)->objectToStringValue();
</span><span class="cx"> if (!result) {
</span><del>- RefPtr<StringImpl> newString = WTF::tryMakeString("[object ", thisObject->methodTable(exec->vm())->className(thisObject), "]");
</del><ins>+ String newString = WTF::tryMakeString("[object ", thisObject->methodTable(exec->vm())->className(thisObject), "]");
</ins><span class="cx"> if (!newString)
</span><span class="cx"> return JSValue::encode(throwOutOfMemoryError(exec));
</span><span class="cx">
</span><del>- result = jsNontrivialString(&vm, newString.release());
</del><ins>+ result = jsNontrivialString(&vm, newString);
</ins><span class="cx"> thisObject->structure(vm)->setObjectToStringValue(vm, result);
</span><span class="cx"> }
</span><span class="cx"> return JSValue::encode(result);
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (190881 => 190882)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-10-12 19:36:03 UTC (rev 190881)
+++ trunk/Source/WTF/ChangeLog 2015-10-12 19:44:52 UTC (rev 190882)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2015-10-12 Andreas Kling <akling@apple.com>
+
+ "A + B" with strings shouldn't copy if A or B is empty.
+ <https://webkit.org/b/150034>
+
+ Reviewed by Anders Carlsson.
+
+ Add a fast path to WTF's operator+ magic for concatenation of two strings where
+ one of them is empty. In that case, try to avoid allocation altogether by returning
+ the non-empty string.
+
+ Spotted this while analyzing memory peaks during page load; it turns out we were
+ duplicating whole text resources (JS, CSS) at the end of decoding, below
+ TextResourceDecoder::decodeAndFlush(). That function effectively does:
+
+ return decode() + flush();
+
+ Very often, flush() returns an empty string, so due to the naive operator+,
+ we'd allocate a new StringImpl of length (decode().length() + flush().length())
+ and copy the return value from decode() into it. So silly!
+
+ Had to make the tryMakeString() machinery use String as a return type instead of
+ RefPtr<StringImpl> to make all the right overloads gel. StringTypeAdapter templates
+ are now required to provide a toString() function.
+
+ * wtf/text/StringConcatenate.h:
+ (WTF::StringTypeAdapter<char>::toString):
+ (WTF::StringTypeAdapter<UChar>::toString):
+ (WTF::StringTypeAdapter<Vector<char>>::toString):
+ (WTF::StringTypeAdapter<String>::toString):
+ (WTF::tryMakeString):
+ (WTF::makeString):
+ * wtf/text/StringOperators.h:
+ (WTF::StringAppend::operator String):
+ * wtf/text/StringView.h:
+ (WTF::StringTypeAdapter<StringView>::toString):
+
</ins><span class="cx"> 2015-10-12 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, fix style in the hopes that it fixes Windows.
</span></span></pre></div>
<a id="trunkSourceWTFwtftextStringConcatenateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringConcatenate.h (190881 => 190882)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringConcatenate.h 2015-10-12 19:36:03 UTC (rev 190881)
+++ trunk/Source/WTF/wtf/text/StringConcatenate.h 2015-10-12 19:44:52 UTC (rev 190882)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2010 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2010-2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -68,6 +68,8 @@
</span><span class="cx"> *destination = m_character;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ String toString() const { return String(&m_character, 1); }
+
</ins><span class="cx"> private:
</span><span class="cx"> char m_character;
</span><span class="cx"> };
</span><span class="lines">@@ -94,6 +96,8 @@
</span><span class="cx"> *destination = m_character;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ String toString() const { return String(&m_character, 1); }
+
</ins><span class="cx"> private:
</span><span class="cx"> UChar m_character;
</span><span class="cx"> };
</span><span class="lines">@@ -120,6 +124,8 @@
</span><span class="cx"> StringView(m_characters, m_length).getCharactersWithUpconvert(destination);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ String toString() const { return String(m_characters, 1); }
+
</ins><span class="cx"> private:
</span><span class="cx"> const LChar* m_characters;
</span><span class="cx"> unsigned m_length;
</span><span class="lines">@@ -154,6 +160,8 @@
</span><span class="cx"> memcpy(destination, m_characters, m_length * sizeof(UChar));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ String toString() const { return String(m_characters, 1); }
+
</ins><span class="cx"> private:
</span><span class="cx"> const UChar* m_characters;
</span><span class="cx"> unsigned m_length;
</span><span class="lines">@@ -207,6 +215,8 @@
</span><span class="cx"> StringView(reinterpret_cast<const LChar*>(m_vector.data()), m_vector.size()).getCharactersWithUpconvert(destination);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ String toString() const { return String(m_vector.data(), m_vector.size()); }
+
</ins><span class="cx"> private:
</span><span class="cx"> const Vector<char>& m_vector;
</span><span class="cx"> };
</span><span class="lines">@@ -234,6 +244,8 @@
</span><span class="cx"> WTF_STRINGTYPEADAPTER_COPIED_WTF_STRING();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ String toString() const { return m_string; }
+
</ins><span class="cx"> private:
</span><span class="cx"> const String& m_string;
</span><span class="cx"> };
</span><span class="lines">@@ -256,22 +268,27 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename StringType1, typename StringType2>
</span><del>-RefPtr<StringImpl> tryMakeString(StringType1 string1, StringType2 string2)
</del><ins>+String tryMakeString(StringType1 string1, StringType2 string2)
</ins><span class="cx"> {
</span><span class="cx"> StringTypeAdapter<StringType1> adapter1(string1);
</span><span class="cx"> StringTypeAdapter<StringType2> adapter2(string2);
</span><span class="cx">
</span><ins>+ if (adapter1.length() && !adapter2.length())
+ return adapter1.toString();
+ if (!adapter1.length() && adapter2.length())
+ return adapter2.toString();
+
</ins><span class="cx"> bool overflow = false;
</span><span class="cx"> unsigned length = adapter1.length();
</span><span class="cx"> sumWithOverflow(length, adapter2.length(), overflow);
</span><span class="cx"> if (overflow)
</span><del>- return nullptr;
</del><ins>+ return String();
</ins><span class="cx">
</span><span class="cx"> if (adapter1.is8Bit() && adapter2.is8Bit()) {
</span><span class="cx"> LChar* buffer;
</span><span class="cx"> RefPtr<StringImpl> resultImpl = StringImpl::tryCreateUninitialized(length, buffer);
</span><span class="cx"> if (!resultImpl)
</span><del>- return nullptr;
</del><ins>+ return String();
</ins><span class="cx">
</span><span class="cx"> LChar* result = buffer;
</span><span class="cx"> adapter1.writeTo(result);
</span><span class="lines">@@ -284,7 +301,7 @@
</span><span class="cx"> UChar* buffer;
</span><span class="cx"> RefPtr<StringImpl> resultImpl = StringImpl::tryCreateUninitialized(length, buffer);
</span><span class="cx"> if (!resultImpl)
</span><del>- return nullptr;
</del><ins>+ return String();
</ins><span class="cx">
</span><span class="cx"> UChar* result = buffer;
</span><span class="cx"> adapter1.writeTo(result);
</span><span class="lines">@@ -295,7 +312,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename StringType1, typename StringType2, typename StringType3>
</span><del>-RefPtr<StringImpl> tryMakeString(StringType1 string1, StringType2 string2, StringType3 string3)
</del><ins>+String tryMakeString(StringType1 string1, StringType2 string2, StringType3 string3)
</ins><span class="cx"> {
</span><span class="cx"> StringTypeAdapter<StringType1> adapter1(string1);
</span><span class="cx"> StringTypeAdapter<StringType2> adapter2(string2);
</span><span class="lines">@@ -306,13 +323,13 @@
</span><span class="cx"> sumWithOverflow(length, adapter2.length(), overflow);
</span><span class="cx"> sumWithOverflow(length, adapter3.length(), overflow);
</span><span class="cx"> if (overflow)
</span><del>- return nullptr;
</del><ins>+ return String();
</ins><span class="cx">
</span><span class="cx"> if (adapter1.is8Bit() && adapter2.is8Bit() && adapter3.is8Bit()) {
</span><span class="cx"> LChar* buffer;
</span><span class="cx"> RefPtr<StringImpl> resultImpl = StringImpl::tryCreateUninitialized(length, buffer);
</span><span class="cx"> if (!resultImpl)
</span><del>- return nullptr;
</del><ins>+ return String();
</ins><span class="cx">
</span><span class="cx"> LChar* result = buffer;
</span><span class="cx"> adapter1.writeTo(result);
</span><span class="lines">@@ -327,7 +344,7 @@
</span><span class="cx"> UChar* buffer = 0;
</span><span class="cx"> RefPtr<StringImpl> resultImpl = StringImpl::tryCreateUninitialized(length, buffer);
</span><span class="cx"> if (!resultImpl)
</span><del>- return nullptr;
</del><ins>+ return String();
</ins><span class="cx">
</span><span class="cx"> UChar* result = buffer;
</span><span class="cx"> adapter1.writeTo(result);
</span><span class="lines">@@ -340,7 +357,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename StringType1, typename StringType2, typename StringType3, typename StringType4>
</span><del>-RefPtr<StringImpl> tryMakeString(StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4)
</del><ins>+String tryMakeString(StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4)
</ins><span class="cx"> {
</span><span class="cx"> StringTypeAdapter<StringType1> adapter1(string1);
</span><span class="cx"> StringTypeAdapter<StringType2> adapter2(string2);
</span><span class="lines">@@ -353,13 +370,13 @@
</span><span class="cx"> sumWithOverflow(length, adapter3.length(), overflow);
</span><span class="cx"> sumWithOverflow(length, adapter4.length(), overflow);
</span><span class="cx"> if (overflow)
</span><del>- return nullptr;
</del><ins>+ return String();
</ins><span class="cx">
</span><span class="cx"> if (adapter1.is8Bit() && adapter2.is8Bit() && adapter3.is8Bit() && adapter4.is8Bit()) {
</span><span class="cx"> LChar* buffer;
</span><span class="cx"> RefPtr<StringImpl> resultImpl = StringImpl::tryCreateUninitialized(length, buffer);
</span><span class="cx"> if (!resultImpl)
</span><del>- return nullptr;
</del><ins>+ return String();
</ins><span class="cx">
</span><span class="cx"> LChar* result = buffer;
</span><span class="cx"> adapter1.writeTo(result);
</span><span class="lines">@@ -376,7 +393,7 @@
</span><span class="cx"> UChar* buffer;
</span><span class="cx"> RefPtr<StringImpl> resultImpl = StringImpl::tryCreateUninitialized(length, buffer);
</span><span class="cx"> if (!resultImpl)
</span><del>- return nullptr;
</del><ins>+ return String();
</ins><span class="cx">
</span><span class="cx"> UChar* result = buffer;
</span><span class="cx"> adapter1.writeTo(result);
</span><span class="lines">@@ -391,7 +408,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename StringType1, typename StringType2, typename StringType3, typename StringType4, typename StringType5>
</span><del>-RefPtr<StringImpl> tryMakeString(StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4, StringType5 string5)
</del><ins>+String tryMakeString(StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4, StringType5 string5)
</ins><span class="cx"> {
</span><span class="cx"> StringTypeAdapter<StringType1> adapter1(string1);
</span><span class="cx"> StringTypeAdapter<StringType2> adapter2(string2);
</span><span class="lines">@@ -406,13 +423,13 @@
</span><span class="cx"> sumWithOverflow(length, adapter4.length(), overflow);
</span><span class="cx"> sumWithOverflow(length, adapter5.length(), overflow);
</span><span class="cx"> if (overflow)
</span><del>- return nullptr;
</del><ins>+ return String();
</ins><span class="cx">
</span><span class="cx"> if (adapter1.is8Bit() && adapter2.is8Bit() && adapter3.is8Bit() && adapter4.is8Bit() && adapter5.is8Bit()) {
</span><span class="cx"> LChar* buffer;
</span><span class="cx"> RefPtr<StringImpl> resultImpl = StringImpl::tryCreateUninitialized(length, buffer);
</span><span class="cx"> if (!resultImpl)
</span><del>- return nullptr;
</del><ins>+ return String();
</ins><span class="cx">
</span><span class="cx"> LChar* result = buffer;
</span><span class="cx"> adapter1.writeTo(result);
</span><span class="lines">@@ -431,7 +448,7 @@
</span><span class="cx"> UChar* buffer;
</span><span class="cx"> RefPtr<StringImpl> resultImpl = StringImpl::tryCreateUninitialized(length, buffer);
</span><span class="cx"> if (!resultImpl)
</span><del>- return nullptr;
</del><ins>+ return String();
</ins><span class="cx">
</span><span class="cx"> UChar* result = buffer;
</span><span class="cx"> adapter1.writeTo(result);
</span><span class="lines">@@ -448,7 +465,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename StringType1, typename StringType2, typename StringType3, typename StringType4, typename StringType5, typename StringType6>
</span><del>-RefPtr<StringImpl> tryMakeString(StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4, StringType5 string5, StringType6 string6)
</del><ins>+String tryMakeString(StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4, StringType5 string5, StringType6 string6)
</ins><span class="cx"> {
</span><span class="cx"> StringTypeAdapter<StringType1> adapter1(string1);
</span><span class="cx"> StringTypeAdapter<StringType2> adapter2(string2);
</span><span class="lines">@@ -465,13 +482,13 @@
</span><span class="cx"> sumWithOverflow(length, adapter5.length(), overflow);
</span><span class="cx"> sumWithOverflow(length, adapter6.length(), overflow);
</span><span class="cx"> if (overflow)
</span><del>- return nullptr;
</del><ins>+ return String();
</ins><span class="cx">
</span><span class="cx"> if (adapter1.is8Bit() && adapter2.is8Bit() && adapter3.is8Bit() && adapter4.is8Bit() && adapter5.is8Bit() && adapter6.is8Bit()) {
</span><span class="cx"> LChar* buffer;
</span><span class="cx"> RefPtr<StringImpl> resultImpl = StringImpl::tryCreateUninitialized(length, buffer);
</span><span class="cx"> if (!resultImpl)
</span><del>- return nullptr;
</del><ins>+ return String();
</ins><span class="cx">
</span><span class="cx"> LChar* result = buffer;
</span><span class="cx"> adapter1.writeTo(result);
</span><span class="lines">@@ -492,7 +509,7 @@
</span><span class="cx"> UChar* buffer;
</span><span class="cx"> RefPtr<StringImpl> resultImpl = StringImpl::tryCreateUninitialized(length, buffer);
</span><span class="cx"> if (!resultImpl)
</span><del>- return nullptr;
</del><ins>+ return String();
</ins><span class="cx">
</span><span class="cx"> UChar* result = buffer;
</span><span class="cx"> adapter1.writeTo(result);
</span><span class="lines">@@ -511,7 +528,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename StringType1, typename StringType2, typename StringType3, typename StringType4, typename StringType5, typename StringType6, typename StringType7>
</span><del>-RefPtr<StringImpl> tryMakeString(StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4, StringType5 string5, StringType6 string6, StringType7 string7)
</del><ins>+String tryMakeString(StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4, StringType5 string5, StringType6 string6, StringType7 string7)
</ins><span class="cx"> {
</span><span class="cx"> StringTypeAdapter<StringType1> adapter1(string1);
</span><span class="cx"> StringTypeAdapter<StringType2> adapter2(string2);
</span><span class="lines">@@ -530,13 +547,13 @@
</span><span class="cx"> sumWithOverflow(length, adapter6.length(), overflow);
</span><span class="cx"> sumWithOverflow(length, adapter7.length(), overflow);
</span><span class="cx"> if (overflow)
</span><del>- return nullptr;
</del><ins>+ return String();
</ins><span class="cx">
</span><span class="cx"> if (adapter1.is8Bit() && adapter2.is8Bit() && adapter3.is8Bit() && adapter4.is8Bit() && adapter5.is8Bit() && adapter6.is8Bit() && adapter7.is8Bit()) {
</span><span class="cx"> LChar* buffer;
</span><span class="cx"> RefPtr<StringImpl> resultImpl = StringImpl::tryCreateUninitialized(length, buffer);
</span><span class="cx"> if (!resultImpl)
</span><del>- return nullptr;
</del><ins>+ return String();
</ins><span class="cx">
</span><span class="cx"> LChar* result = buffer;
</span><span class="cx"> adapter1.writeTo(result);
</span><span class="lines">@@ -559,7 +576,7 @@
</span><span class="cx"> UChar* buffer;
</span><span class="cx"> RefPtr<StringImpl> resultImpl = StringImpl::tryCreateUninitialized(length, buffer);
</span><span class="cx"> if (!resultImpl)
</span><del>- return nullptr;
</del><ins>+ return String();
</ins><span class="cx">
</span><span class="cx"> UChar* result = buffer;
</span><span class="cx"> adapter1.writeTo(result);
</span><span class="lines">@@ -580,7 +597,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename StringType1, typename StringType2, typename StringType3, typename StringType4, typename StringType5, typename StringType6, typename StringType7, typename StringType8>
</span><del>-RefPtr<StringImpl> tryMakeString(StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4, StringType5 string5, StringType6 string6, StringType7 string7, StringType8 string8)
</del><ins>+String tryMakeString(StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4, StringType5 string5, StringType6 string6, StringType7 string7, StringType8 string8)
</ins><span class="cx"> {
</span><span class="cx"> StringTypeAdapter<StringType1> adapter1(string1);
</span><span class="cx"> StringTypeAdapter<StringType2> adapter2(string2);
</span><span class="lines">@@ -601,13 +618,13 @@
</span><span class="cx"> sumWithOverflow(length, adapter7.length(), overflow);
</span><span class="cx"> sumWithOverflow(length, adapter8.length(), overflow);
</span><span class="cx"> if (overflow)
</span><del>- return nullptr;
</del><ins>+ return String();
</ins><span class="cx">
</span><span class="cx"> if (adapter1.is8Bit() && adapter2.is8Bit() && adapter3.is8Bit() && adapter4.is8Bit() && adapter5.is8Bit() && adapter6.is8Bit() && adapter7.is8Bit() && adapter8.is8Bit()) {
</span><span class="cx"> LChar* buffer;
</span><span class="cx"> RefPtr<StringImpl> resultImpl = StringImpl::tryCreateUninitialized(length, buffer);
</span><span class="cx"> if (!resultImpl)
</span><del>- return nullptr;
</del><ins>+ return String();
</ins><span class="cx">
</span><span class="cx"> LChar* result = buffer;
</span><span class="cx"> adapter1.writeTo(result);
</span><span class="lines">@@ -632,7 +649,7 @@
</span><span class="cx"> UChar* buffer;
</span><span class="cx"> RefPtr<StringImpl> resultImpl = StringImpl::tryCreateUninitialized(length, buffer);
</span><span class="cx"> if (!resultImpl)
</span><del>- return nullptr;
</del><ins>+ return String();
</ins><span class="cx">
</span><span class="cx"> UChar* result = buffer;
</span><span class="cx"> adapter1.writeTo(result);
</span><span class="lines">@@ -655,7 +672,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename StringType1, typename StringType2, typename StringType3, typename StringType4, typename StringType5, typename StringType6, typename StringType7, typename StringType8, typename StringType9>
</span><del>-RefPtr<StringImpl> tryMakeString(StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4, StringType5 string5, StringType6 string6, StringType7 string7, StringType8 string8, StringType9 string9)
</del><ins>+String tryMakeString(StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4, StringType5 string5, StringType6 string6, StringType7 string7, StringType8 string8, StringType9 string9)
</ins><span class="cx"> {
</span><span class="cx"> StringTypeAdapter<StringType1> adapter1(string1);
</span><span class="cx"> StringTypeAdapter<StringType2> adapter2(string2);
</span><span class="lines">@@ -678,13 +695,13 @@
</span><span class="cx"> sumWithOverflow(length, adapter8.length(), overflow);
</span><span class="cx"> sumWithOverflow(length, adapter9.length(), overflow);
</span><span class="cx"> if (overflow)
</span><del>- return nullptr;
</del><ins>+ return String();
</ins><span class="cx">
</span><span class="cx"> if (adapter1.is8Bit() && adapter2.is8Bit() && adapter3.is8Bit() && adapter4.is8Bit() && adapter5.is8Bit() && adapter6.is8Bit() && adapter7.is8Bit() && adapter8.is8Bit() && adapter9.is8Bit()) {
</span><span class="cx"> LChar* buffer;
</span><span class="cx"> RefPtr<StringImpl> resultImpl = StringImpl::tryCreateUninitialized(length, buffer);
</span><span class="cx"> if (!resultImpl)
</span><del>- return nullptr;
</del><ins>+ return String();
</ins><span class="cx">
</span><span class="cx"> LChar* result = buffer;
</span><span class="cx"> adapter1.writeTo(result);
</span><span class="lines">@@ -711,7 +728,7 @@
</span><span class="cx"> UChar* buffer;
</span><span class="cx"> RefPtr<StringImpl> resultImpl = StringImpl::tryCreateUninitialized(length, buffer);
</span><span class="cx"> if (!resultImpl)
</span><del>- return nullptr;
</del><ins>+ return String();
</ins><span class="cx">
</span><span class="cx"> UChar* result = buffer;
</span><span class="cx"> adapter1.writeTo(result);
</span><span class="lines">@@ -746,73 +763,73 @@
</span><span class="cx"> template<typename StringType1, typename StringType2>
</span><span class="cx"> String makeString(StringType1 string1, StringType2 string2)
</span><span class="cx"> {
</span><del>- RefPtr<StringImpl> resultImpl = tryMakeString(string1, string2);
- if (!resultImpl)
</del><ins>+ String result = tryMakeString(string1, string2);
+ if (!result)
</ins><span class="cx"> CRASH();
</span><del>- return WTF::move(resultImpl);
</del><ins>+ return result;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename StringType1, typename StringType2, typename StringType3>
</span><span class="cx"> String makeString(StringType1 string1, StringType2 string2, StringType3 string3)
</span><span class="cx"> {
</span><del>- RefPtr<StringImpl> resultImpl = tryMakeString(string1, string2, string3);
- if (!resultImpl)
</del><ins>+ String result = tryMakeString(string1, string2, string3);
+ if (!result)
</ins><span class="cx"> CRASH();
</span><del>- return WTF::move(resultImpl);
</del><ins>+ return result;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename StringType1, typename StringType2, typename StringType3, typename StringType4>
</span><span class="cx"> String makeString(StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4)
</span><span class="cx"> {
</span><del>- RefPtr<StringImpl> resultImpl = tryMakeString(string1, string2, string3, string4);
- if (!resultImpl)
</del><ins>+ String result = tryMakeString(string1, string2, string3, string4);
+ if (!result)
</ins><span class="cx"> CRASH();
</span><del>- return WTF::move(resultImpl);
</del><ins>+ return result;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename StringType1, typename StringType2, typename StringType3, typename StringType4, typename StringType5>
</span><span class="cx"> String makeString(StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4, StringType5 string5)
</span><span class="cx"> {
</span><del>- RefPtr<StringImpl> resultImpl = tryMakeString(string1, string2, string3, string4, string5);
- if (!resultImpl)
</del><ins>+ String result = tryMakeString(string1, string2, string3, string4, string5);
+ if (!result)
</ins><span class="cx"> CRASH();
</span><del>- return WTF::move(resultImpl);
</del><ins>+ return result;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename StringType1, typename StringType2, typename StringType3, typename StringType4, typename StringType5, typename StringType6>
</span><span class="cx"> String makeString(StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4, StringType5 string5, StringType6 string6)
</span><span class="cx"> {
</span><del>- RefPtr<StringImpl> resultImpl = tryMakeString(string1, string2, string3, string4, string5, string6);
- if (!resultImpl)
</del><ins>+ String result = tryMakeString(string1, string2, string3, string4, string5, string6);
+ if (!result)
</ins><span class="cx"> CRASH();
</span><del>- return WTF::move(resultImpl);
</del><ins>+ return result;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename StringType1, typename StringType2, typename StringType3, typename StringType4, typename StringType5, typename StringType6, typename StringType7>
</span><span class="cx"> String makeString(StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4, StringType5 string5, StringType6 string6, StringType7 string7)
</span><span class="cx"> {
</span><del>- RefPtr<StringImpl> resultImpl = tryMakeString(string1, string2, string3, string4, string5, string6, string7);
- if (!resultImpl)
</del><ins>+ String result = tryMakeString(string1, string2, string3, string4, string5, string6, string7);
+ if (!result)
</ins><span class="cx"> CRASH();
</span><del>- return WTF::move(resultImpl);
</del><ins>+ return result;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename StringType1, typename StringType2, typename StringType3, typename StringType4, typename StringType5, typename StringType6, typename StringType7, typename StringType8>
</span><span class="cx"> String makeString(StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4, StringType5 string5, StringType6 string6, StringType7 string7, StringType8 string8)
</span><span class="cx"> {
</span><del>- RefPtr<StringImpl> resultImpl = tryMakeString(string1, string2, string3, string4, string5, string6, string7, string8);
- if (!resultImpl)
</del><ins>+ String result = tryMakeString(string1, string2, string3, string4, string5, string6, string7, string8);
+ if (!result)
</ins><span class="cx"> CRASH();
</span><del>- return WTF::move(resultImpl);
</del><ins>+ return result;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename StringType1, typename StringType2, typename StringType3, typename StringType4, typename StringType5, typename StringType6, typename StringType7, typename StringType8, typename StringType9>
</span><span class="cx"> String makeString(StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4, StringType5 string5, StringType6 string6, StringType7 string7, StringType8 string8, StringType9 string9)
</span><span class="cx"> {
</span><del>- RefPtr<StringImpl> resultImpl = tryMakeString(string1, string2, string3, string4, string5, string6, string7, string8, string9);
- if (!resultImpl)
</del><ins>+ String result = tryMakeString(string1, string2, string3, string4, string5, string6, string7, string8, string9);
+ if (!result)
</ins><span class="cx"> CRASH();
</span><del>- return WTF::move(resultImpl);
</del><ins>+ return result;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WTF
</span></span></pre></div>
<a id="trunkSourceWTFwtftextStringOperatorsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringOperators.h (190881 => 190882)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringOperators.h 2015-10-12 19:36:03 UTC (rev 190881)
+++ trunk/Source/WTF/wtf/text/StringOperators.h 2015-10-12 19:44:52 UTC (rev 190882)
</span><span class="lines">@@ -35,10 +35,10 @@
</span><span class="cx">
</span><span class="cx"> operator String() const
</span><span class="cx"> {
</span><del>- RefPtr<StringImpl> resultImpl = tryMakeString(m_string1, m_string2);
- if (!resultImpl)
</del><ins>+ String result = tryMakeString(m_string1, m_string2);
+ if (!result)
</ins><span class="cx"> CRASH();
</span><del>- return resultImpl.release();
</del><ins>+ return result;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> operator AtomicString() const
</span><span class="lines">@@ -97,6 +97,8 @@
</span><span class="cx"> void writeTo(LChar* destination) { m_buffer.writeTo(destination); }
</span><span class="cx"> void writeTo(UChar* destination) { m_buffer.writeTo(destination); }
</span><span class="cx">
</span><ins>+ String toString() const { return m_buffer; }
+
</ins><span class="cx"> private:
</span><span class="cx"> StringAppend<StringType1, StringType2>& m_buffer;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWTFwtftextStringViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringView.h (190881 => 190882)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringView.h 2015-10-12 19:36:03 UTC (rev 190881)
+++ trunk/Source/WTF/wtf/text/StringView.h 2015-10-12 19:44:52 UTC (rev 190882)
</span><span class="lines">@@ -497,6 +497,8 @@
</span><span class="cx"> void writeTo(LChar* destination) { m_string.getCharactersWithUpconvert(destination); }
</span><span class="cx"> void writeTo(UChar* destination) { m_string.getCharactersWithUpconvert(destination); }
</span><span class="cx">
</span><ins>+ String toString() const { return m_string.toString(); }
+
</ins><span class="cx"> private:
</span><span class="cx"> StringView m_string;
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>