<!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>[184972] trunk/Source/WTF</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/184972">184972</a></dd>
<dt>Author</dt> <dd>gyuyoung.kim@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-28 18:08:06 -0700 (Thu, 28 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Purge PassRefPtr in StringConcatenate.h
https://bugs.webkit.org/show_bug.cgi?id=145376
Reviewed by Darin Adler.
Replace PassRefPtr with RefPtr. Additionally use nullptr instead of 0.
* wtf/text/StringConcatenate.h:
(WTF::tryMakeString):
(WTF::makeString):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtftextStringConcatenateh">trunk/Source/WTF/wtf/text/StringConcatenate.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (184971 => 184972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-05-29 00:20:40 UTC (rev 184971)
+++ trunk/Source/WTF/ChangeLog 2015-05-29 01:08:06 UTC (rev 184972)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-05-28 Gyuyoung Kim <gyuyoung.kim@webkit.org>
+
+ Purge PassRefPtr in StringConcatenate.h
+ https://bugs.webkit.org/show_bug.cgi?id=145376
+
+ Reviewed by Darin Adler.
+
+ Replace PassRefPtr with RefPtr. Additionally use nullptr instead of 0.
+
+ * wtf/text/StringConcatenate.h:
+ (WTF::tryMakeString):
+ (WTF::makeString):
+
</ins><span class="cx"> 2015-05-28 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> Clean up HashTable constructors
</span></span></pre></div>
<a id="trunkSourceWTFwtftextStringConcatenateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringConcatenate.h (184971 => 184972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringConcatenate.h 2015-05-29 00:20:40 UTC (rev 184971)
+++ trunk/Source/WTF/wtf/text/StringConcatenate.h 2015-05-29 01:08:06 UTC (rev 184972)
</span><span class="lines">@@ -256,7 +256,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename StringType1, typename StringType2>
</span><del>-PassRefPtr<StringImpl> tryMakeString(StringType1 string1, StringType2 string2)
</del><ins>+RefPtr<StringImpl> 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="lines">@@ -265,37 +265,37 @@
</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 0;
</del><ins>+ return nullptr;
</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 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> LChar* result = buffer;
</span><span class="cx"> adapter1.writeTo(result);
</span><span class="cx"> result += adapter1.length();
</span><span class="cx"> adapter2.writeTo(result);
</span><span class="cx">
</span><del>- return resultImpl.release();
</del><ins>+ return WTF::move(resultImpl);
</ins><span class="cx"> }
</span><span class="cx">
</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 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> UChar* result = buffer;
</span><span class="cx"> adapter1.writeTo(result);
</span><span class="cx"> result += adapter1.length();
</span><span class="cx"> adapter2.writeTo(result);
</span><span class="cx">
</span><del>- return resultImpl.release();
</del><ins>+ return WTF::move(resultImpl);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename StringType1, typename StringType2, typename StringType3>
</span><del>-PassRefPtr<StringImpl> tryMakeString(StringType1 string1, StringType2 string2, StringType3 string3)
</del><ins>+RefPtr<StringImpl> 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 +306,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 0;
</del><ins>+ return nullptr;
</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 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> LChar* result = buffer;
</span><span class="cx"> adapter1.writeTo(result);
</span><span class="lines">@@ -321,13 +321,13 @@
</span><span class="cx"> result += adapter2.length();
</span><span class="cx"> adapter3.writeTo(result);
</span><span class="cx">
</span><del>- return resultImpl.release();
</del><ins>+ return WTF::move(resultImpl);
</ins><span class="cx"> }
</span><span class="cx">
</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 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> UChar* result = buffer;
</span><span class="cx"> adapter1.writeTo(result);
</span><span class="lines">@@ -336,11 +336,11 @@
</span><span class="cx"> result += adapter2.length();
</span><span class="cx"> adapter3.writeTo(result);
</span><span class="cx">
</span><del>- return resultImpl.release();
</del><ins>+ return WTF::move(resultImpl);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename StringType1, typename StringType2, typename StringType3, typename StringType4>
</span><del>-PassRefPtr<StringImpl> tryMakeString(StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4)
</del><ins>+RefPtr<StringImpl> 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 +353,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 0;
</del><ins>+ return nullptr;
</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 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> LChar* result = buffer;
</span><span class="cx"> adapter1.writeTo(result);
</span><span class="lines">@@ -370,13 +370,13 @@
</span><span class="cx"> result += adapter3.length();
</span><span class="cx"> adapter4.writeTo(result);
</span><span class="cx">
</span><del>- return resultImpl.release();
</del><ins>+ return WTF::move(resultImpl);
</ins><span class="cx"> }
</span><span class="cx">
</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 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> UChar* result = buffer;
</span><span class="cx"> adapter1.writeTo(result);
</span><span class="lines">@@ -387,11 +387,11 @@
</span><span class="cx"> result += adapter3.length();
</span><span class="cx"> adapter4.writeTo(result);
</span><span class="cx">
</span><del>- return resultImpl.release();
</del><ins>+ return WTF::move(resultImpl);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename StringType1, typename StringType2, typename StringType3, typename StringType4, typename StringType5>
</span><del>-PassRefPtr<StringImpl> tryMakeString(StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4, StringType5 string5)
</del><ins>+RefPtr<StringImpl> 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 +406,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 0;
</del><ins>+ return nullptr;
</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 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> LChar* result = buffer;
</span><span class="cx"> adapter1.writeTo(result);
</span><span class="lines">@@ -425,13 +425,13 @@
</span><span class="cx"> result += adapter4.length();
</span><span class="cx"> adapter5.writeTo(result);
</span><span class="cx">
</span><del>- return resultImpl.release();
</del><ins>+ return WTF::move(resultImpl);
</ins><span class="cx"> }
</span><span class="cx">
</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 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> UChar* result = buffer;
</span><span class="cx"> adapter1.writeTo(result);
</span><span class="lines">@@ -444,11 +444,11 @@
</span><span class="cx"> result += adapter4.length();
</span><span class="cx"> adapter5.writeTo(result);
</span><span class="cx">
</span><del>- return resultImpl.release();
</del><ins>+ return WTF::move(resultImpl);
</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><del>-PassRefPtr<StringImpl> tryMakeString(StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4, StringType5 string5, StringType6 string6)
</del><ins>+RefPtr<StringImpl> 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 +465,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 0;
</del><ins>+ return nullptr;
</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 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> LChar* result = buffer;
</span><span class="cx"> adapter1.writeTo(result);
</span><span class="lines">@@ -486,13 +486,13 @@
</span><span class="cx"> result += adapter5.length();
</span><span class="cx"> adapter6.writeTo(result);
</span><span class="cx">
</span><del>- return resultImpl.release();
</del><ins>+ return WTF::move(resultImpl);
</ins><span class="cx"> }
</span><span class="cx">
</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 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> UChar* result = buffer;
</span><span class="cx"> adapter1.writeTo(result);
</span><span class="lines">@@ -507,11 +507,11 @@
</span><span class="cx"> result += adapter5.length();
</span><span class="cx"> adapter6.writeTo(result);
</span><span class="cx">
</span><del>- return resultImpl.release();
</del><ins>+ return WTF::move(resultImpl);
</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><del>-PassRefPtr<StringImpl> tryMakeString(StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4, StringType5 string5, StringType6 string6, StringType7 string7)
</del><ins>+RefPtr<StringImpl> 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 +530,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 0;
</del><ins>+ return nullptr;
</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 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> LChar* result = buffer;
</span><span class="cx"> adapter1.writeTo(result);
</span><span class="lines">@@ -553,13 +553,13 @@
</span><span class="cx"> result += adapter6.length();
</span><span class="cx"> adapter7.writeTo(result);
</span><span class="cx">
</span><del>- return resultImpl.release();
</del><ins>+ return WTF::move(resultImpl);
</ins><span class="cx"> }
</span><span class="cx">
</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 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> UChar* result = buffer;
</span><span class="cx"> adapter1.writeTo(result);
</span><span class="lines">@@ -576,11 +576,11 @@
</span><span class="cx"> result += adapter6.length();
</span><span class="cx"> adapter7.writeTo(result);
</span><span class="cx">
</span><del>- return resultImpl.release();
</del><ins>+ return WTF::move(resultImpl);
</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><del>-PassRefPtr<StringImpl> tryMakeString(StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4, StringType5 string5, StringType6 string6, StringType7 string7, StringType8 string8)
</del><ins>+RefPtr<StringImpl> 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 +601,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 0;
</del><ins>+ return nullptr;
</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 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> LChar* result = buffer;
</span><span class="cx"> adapter1.writeTo(result);
</span><span class="lines">@@ -626,13 +626,13 @@
</span><span class="cx"> result += adapter7.length();
</span><span class="cx"> adapter8.writeTo(result);
</span><span class="cx">
</span><del>- return resultImpl.release();
</del><ins>+ return WTF::move(resultImpl);
</ins><span class="cx"> }
</span><span class="cx">
</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 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> UChar* result = buffer;
</span><span class="cx"> adapter1.writeTo(result);
</span><span class="lines">@@ -651,11 +651,11 @@
</span><span class="cx"> result += adapter7.length();
</span><span class="cx"> adapter8.writeTo(result);
</span><span class="cx">
</span><del>- return resultImpl.release();
</del><ins>+ return WTF::move(resultImpl);
</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><del>-PassRefPtr<StringImpl> tryMakeString(StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4, StringType5 string5, StringType6 string6, StringType7 string7, StringType8 string8, StringType9 string9)
</del><ins>+RefPtr<StringImpl> 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 +678,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 0;
</del><ins>+ return nullptr;
</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 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> LChar* result = buffer;
</span><span class="cx"> adapter1.writeTo(result);
</span><span class="lines">@@ -705,13 +705,13 @@
</span><span class="cx"> result += adapter8.length();
</span><span class="cx"> adapter9.writeTo(result);
</span><span class="cx">
</span><del>- return resultImpl.release();
</del><ins>+ return WTF::move(resultImpl);
</ins><span class="cx"> }
</span><span class="cx">
</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 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> UChar* result = buffer;
</span><span class="cx"> adapter1.writeTo(result);
</span><span class="lines">@@ -732,7 +732,7 @@
</span><span class="cx"> result += adapter8.length();
</span><span class="cx"> adapter9.writeTo(result);
</span><span class="cx">
</span><del>- return resultImpl.release();
</del><ins>+ return WTF::move(resultImpl);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -749,7 +749,7 @@
</span><span class="cx"> RefPtr<StringImpl> resultImpl = tryMakeString(string1, string2);
</span><span class="cx"> if (!resultImpl)
</span><span class="cx"> CRASH();
</span><del>- return resultImpl.release();
</del><ins>+ return WTF::move(resultImpl);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename StringType1, typename StringType2, typename StringType3>
</span><span class="lines">@@ -758,7 +758,7 @@
</span><span class="cx"> RefPtr<StringImpl> resultImpl = tryMakeString(string1, string2, string3);
</span><span class="cx"> if (!resultImpl)
</span><span class="cx"> CRASH();
</span><del>- return resultImpl.release();
</del><ins>+ return WTF::move(resultImpl);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename StringType1, typename StringType2, typename StringType3, typename StringType4>
</span><span class="lines">@@ -767,7 +767,7 @@
</span><span class="cx"> RefPtr<StringImpl> resultImpl = tryMakeString(string1, string2, string3, string4);
</span><span class="cx"> if (!resultImpl)
</span><span class="cx"> CRASH();
</span><del>- return resultImpl.release();
</del><ins>+ return WTF::move(resultImpl);
</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="lines">@@ -776,7 +776,7 @@
</span><span class="cx"> RefPtr<StringImpl> resultImpl = tryMakeString(string1, string2, string3, string4, string5);
</span><span class="cx"> if (!resultImpl)
</span><span class="cx"> CRASH();
</span><del>- return resultImpl.release();
</del><ins>+ return WTF::move(resultImpl);
</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="lines">@@ -785,7 +785,7 @@
</span><span class="cx"> RefPtr<StringImpl> resultImpl = tryMakeString(string1, string2, string3, string4, string5, string6);
</span><span class="cx"> if (!resultImpl)
</span><span class="cx"> CRASH();
</span><del>- return resultImpl.release();
</del><ins>+ return WTF::move(resultImpl);
</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="lines">@@ -794,7 +794,7 @@
</span><span class="cx"> RefPtr<StringImpl> resultImpl = tryMakeString(string1, string2, string3, string4, string5, string6, string7);
</span><span class="cx"> if (!resultImpl)
</span><span class="cx"> CRASH();
</span><del>- return resultImpl.release();
</del><ins>+ return WTF::move(resultImpl);
</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="lines">@@ -803,7 +803,7 @@
</span><span class="cx"> RefPtr<StringImpl> resultImpl = tryMakeString(string1, string2, string3, string4, string5, string6, string7, string8);
</span><span class="cx"> if (!resultImpl)
</span><span class="cx"> CRASH();
</span><del>- return resultImpl.release();
</del><ins>+ return WTF::move(resultImpl);
</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="lines">@@ -812,7 +812,7 @@
</span><span class="cx"> RefPtr<StringImpl> resultImpl = tryMakeString(string1, string2, string3, string4, string5, string6, string7, string8, string9);
</span><span class="cx"> if (!resultImpl)
</span><span class="cx"> CRASH();
</span><del>- return resultImpl.release();
</del><ins>+ return WTF::move(resultImpl);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WTF
</span></span></pre>
</div>
</div>
</body>
</html>