<!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>[163326] 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/163326">163326</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-02-03 14:04:56 -0800 (Mon, 03 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Consolidate StringImpl tail handling into two functions
https://bugs.webkit.org/show_bug.cgi?id=128122
Reviewed by Andreas Kling.
* wtf/text/StringImpl.cpp:
(WTF::StringImpl::createUninitializedInternalNonEmpty):
(WTF::StringImpl::reallocateInternal):
* wtf/text/StringImpl.h:
(WTF::StringImpl::tryCreateUninitialized):
(WTF::StringImpl::allocationSize):
(WTF::StringImpl::tailPointer):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtftextStringImplcpp">trunk/Source/WTF/wtf/text/StringImpl.cpp</a></li>
<li><a href="#trunkSourceWTFwtftextStringImplh">trunk/Source/WTF/wtf/text/StringImpl.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (163325 => 163326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-02-03 21:52:55 UTC (rev 163325)
+++ trunk/Source/WTF/ChangeLog 2014-02-03 22:04:56 UTC (rev 163326)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-02-03 Anders Carlsson <andersca@apple.com>
+
+ Consolidate StringImpl tail handling into two functions
+ https://bugs.webkit.org/show_bug.cgi?id=128122
+
+ Reviewed by Andreas Kling.
+
+ * wtf/text/StringImpl.cpp:
+ (WTF::StringImpl::createUninitializedInternalNonEmpty):
+ (WTF::StringImpl::reallocateInternal):
+ * wtf/text/StringImpl.h:
+ (WTF::StringImpl::tryCreateUninitialized):
+ (WTF::StringImpl::allocationSize):
+ (WTF::StringImpl::tailPointer):
+
</ins><span class="cx"> 2014-02-03 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove Unicode.h
</span></span></pre></div>
<a id="trunkSourceWTFwtftextStringImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringImpl.cpp (163325 => 163326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringImpl.cpp 2014-02-03 21:52:55 UTC (rev 163325)
+++ trunk/Source/WTF/wtf/text/StringImpl.cpp 2014-02-03 22:04:56 UTC (rev 163326)
</span><span class="lines">@@ -195,8 +195,7 @@
</span><span class="cx"> // heap allocation from this call.
</span><span class="cx"> if (length > ((std::numeric_limits<unsigned>::max() - sizeof(StringImpl)) / sizeof(CharType)))
</span><span class="cx"> CRASH();
</span><del>- size_t size = sizeof(StringImpl) + length * sizeof(CharType);
- StringImpl* string = static_cast<StringImpl*>(fastMalloc(size));
</del><ins>+ StringImpl* string = static_cast<StringImpl*>(fastMalloc(allocationSize<CharType>(length)));
</ins><span class="cx">
</span><span class="cx"> data = reinterpret_cast<CharType*>(string + 1);
</span><span class="cx"> return constructInternal<CharType>(string, length);
</span><span class="lines">@@ -226,11 +225,11 @@
</span><span class="cx"> // Same as createUninitialized() except here we use fastRealloc.
</span><span class="cx"> if (length > ((std::numeric_limits<unsigned>::max() - sizeof(StringImpl)) / sizeof(CharType)))
</span><span class="cx"> CRASH();
</span><del>- size_t size = sizeof(StringImpl) + length * sizeof(CharType);
</del><ins>+
</ins><span class="cx"> originalString->~StringImpl();
</span><del>- StringImpl* string = static_cast<StringImpl*>(fastRealloc(originalString.leakRef(), size));
</del><ins>+ StringImpl* string = static_cast<StringImpl*>(fastRealloc(originalString.leakRef(), allocationSize<CharType>(length)));
</ins><span class="cx">
</span><del>- data = reinterpret_cast<CharType*>(string + 1);
</del><ins>+ data = string->tailPointer<CharType>();
</ins><span class="cx"> return constructInternal<CharType>(string, length);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtftextStringImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringImpl.h (163325 => 163326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringImpl.h 2014-02-03 21:52:55 UTC (rev 163325)
+++ trunk/Source/WTF/wtf/text/StringImpl.h 2014-02-03 22:04:56 UTC (rev 163326)
</span><span class="lines">@@ -408,11 +408,11 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx"> StringImpl* resultImpl;
</span><del>- if (!tryFastMalloc(sizeof(T) * length + sizeof(StringImpl)).getValue(resultImpl)) {
</del><ins>+ if (!tryFastMalloc(allocationSize<T>(length)).getValue(resultImpl)) {
</ins><span class="cx"> output = 0;
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><del>- output = reinterpret_cast<T*>(resultImpl + 1);
</del><ins>+ output = resultImpl->tailPointer<T>();
</ins><span class="cx">
</span><span class="cx"> return constructInternal<T>(resultImpl, length);
</span><span class="cx"> }
</span><span class="lines">@@ -769,6 +769,18 @@
</span><span class="cx"> return reinterpret_cast<const void*>(m_data16) == reinterpret_cast<const void*>(this + 1);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ template<typename T>
+ static size_t allocationSize(unsigned tailElementCount)
+ {
+ return sizeof(StringImpl) + tailElementCount * sizeof(T);
+ }
+
+ template<typename T>
+ T* tailPointer()
+ {
+ return reinterpret_cast<T*>(this + 1);
+ }
+
</ins><span class="cx"> // This number must be at least 2 to avoid sharing empty, null as well as 1 character strings from SmallStrings.
</span><span class="cx"> static const unsigned s_copyCharsInlineCutOff = 20;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>