<!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>[163396] 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/163396">163396</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-02-04 12:28:49 -0800 (Tue, 04 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get rid of StringImpl::m_buffer
https://bugs.webkit.org/show_bug.cgi?id=128200
Reviewed by Michael Saboff.
Trade one lousy hack for another by changing the CreateEmptyUnique StringImpl
constructor to initialize its character buffer to point to m_length instead
since it will always be null.
Also change it to be an 8-bit string because why not.
* wtf/text/StringImpl.h:
(WTF::StringImpl::StringImpl):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</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 (163395 => 163396)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-02-04 19:36:48 UTC (rev 163395)
+++ trunk/Source/WTF/ChangeLog 2014-02-04 20:28:49 UTC (rev 163396)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2014-02-04 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Get rid of StringImpl::m_buffer
+ https://bugs.webkit.org/show_bug.cgi?id=128200
+
+ Reviewed by Michael Saboff.
+
+ Trade one lousy hack for another by changing the CreateEmptyUnique StringImpl
+ constructor to initialize its character buffer to point to m_length instead
+ since it will always be null.
+
+ Also change it to be an 8-bit string because why not.
+
+ * wtf/text/StringImpl.h:
+ (WTF::StringImpl::StringImpl):
+
+2014-02-04 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Rename String::getCharacters to String::characters
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=128196
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtftextStringImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringImpl.h (163395 => 163396)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringImpl.h 2014-02-04 19:36:48 UTC (rev 163395)
+++ trunk/Source/WTF/wtf/text/StringImpl.h 2014-02-04 20:28:49 UTC (rev 163396)
</span><span class="lines">@@ -162,7 +162,6 @@
</span><span class="cx"> : m_refCount(s_refCountFlagIsStaticString)
</span><span class="cx"> , m_length(length)
</span><span class="cx"> , m_data16(characters)
</span><del>- , m_buffer(0)
</del><span class="cx"> , m_hashAndFlags(s_hashFlagIsIdentifier | BufferOwned)
</span><span class="cx"> {
</span><span class="cx"> // Ensure that the hash is computed so that AtomicStringHash can call existingHash()
</span><span class="lines">@@ -180,7 +179,6 @@
</span><span class="cx"> : m_refCount(s_refCountFlagIsStaticString)
</span><span class="cx"> , m_length(length)
</span><span class="cx"> , m_data8(characters)
</span><del>- , m_buffer(0)
</del><span class="cx"> , m_hashAndFlags(s_hashFlag8BitBuffer | s_hashFlagIsIdentifier | BufferOwned)
</span><span class="cx"> {
</span><span class="cx"> // Ensure that the hash is computed so that AtomicStringHash can call existingHash()
</span><span class="lines">@@ -198,7 +196,6 @@
</span><span class="cx"> : m_refCount(s_refCountIncrement)
</span><span class="cx"> , m_length(length)
</span><span class="cx"> , m_data8(tailPointer<LChar>())
</span><del>- , m_buffer(0)
</del><span class="cx"> , m_hashAndFlags(s_hashFlag8BitBuffer | BufferInternal)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_data8);
</span><span class="lines">@@ -212,7 +209,6 @@
</span><span class="cx"> : m_refCount(s_refCountIncrement)
</span><span class="cx"> , m_length(length)
</span><span class="cx"> , m_data16(tailPointer<UChar>())
</span><del>- , m_buffer(0)
</del><span class="cx"> , m_hashAndFlags(BufferInternal)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_data16);
</span><span class="lines">@@ -226,7 +222,6 @@
</span><span class="cx"> : m_refCount(s_refCountIncrement)
</span><span class="cx"> , m_length(length)
</span><span class="cx"> , m_data8(characters.leakPtr())
</span><del>- , m_buffer(0)
</del><span class="cx"> , m_hashAndFlags(s_hashFlag8BitBuffer | BufferOwned)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_data8);
</span><span class="lines">@@ -240,7 +235,6 @@
</span><span class="cx"> : m_refCount(s_refCountIncrement)
</span><span class="cx"> , m_length(length)
</span><span class="cx"> , m_data16(characters)
</span><del>- , m_buffer(0)
</del><span class="cx"> , m_hashAndFlags(BufferInternal)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_data16);
</span><span class="lines">@@ -253,7 +247,6 @@
</span><span class="cx"> : m_refCount(s_refCountIncrement)
</span><span class="cx"> , m_length(length)
</span><span class="cx"> , m_data8(characters)
</span><del>- , m_buffer(0)
</del><span class="cx"> , m_hashAndFlags(s_hashFlag8BitBuffer | BufferInternal)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_data8);
</span><span class="lines">@@ -267,7 +260,6 @@
</span><span class="cx"> : m_refCount(s_refCountIncrement)
</span><span class="cx"> , m_length(length)
</span><span class="cx"> , m_data16(characters.leakPtr())
</span><del>- , m_buffer(0)
</del><span class="cx"> , m_hashAndFlags(BufferOwned)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_data16);
</span><span class="lines">@@ -308,16 +300,15 @@
</span><span class="cx"> STRING_STATS_ADD_16BIT_STRING2(m_length, true);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- enum CreateEmptyUnique_T { CreateEmptyUnique };
- StringImpl(CreateEmptyUnique_T)
</del><ins>+ enum CreateEmptyUniqueTag { CreateEmptyUnique };
+ StringImpl(CreateEmptyUniqueTag)
</ins><span class="cx"> : m_refCount(s_refCountIncrement)
</span><span class="cx"> , m_length(0)
</span><del>- // We expect m_buffer to be initialized to 0 as we use it
</del><ins>+ // We expect m_length to be initialized to 0 as we use it
</ins><span class="cx"> // to represent a null terminated buffer.
</span><del>- , m_data16(reinterpret_cast<const UChar*>(&m_buffer))
- , m_buffer(0)
</del><ins>+ , m_data8(reinterpret_cast<const LChar*>(&m_length))
</ins><span class="cx"> {
</span><del>- ASSERT(m_data16);
</del><ins>+ ASSERT(m_data8);
</ins><span class="cx"> // Set the hash early, so that all empty unique StringImpls have a hash,
</span><span class="cx"> // and don't use the normal hashing algorithm - the unique nature of these
</span><span class="cx"> // keys means that we don't need them to match any other string (in fact,
</span><span class="lines">@@ -327,9 +318,9 @@
</span><span class="cx"> hash <<= s_flagCount;
</span><span class="cx"> if (!hash)
</span><span class="cx"> hash = 1 << s_flagCount;
</span><del>- m_hashAndFlags = hash | BufferInternal;
</del><ins>+ m_hashAndFlags = hash | BufferInternal | s_hashFlag8BitBuffer;
</ins><span class="cx">
</span><del>- STRING_STATS_ADD_16BIT_STRING(m_length);
</del><ins>+ STRING_STATS_ADD_8BIT_STRING(m_length);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ~StringImpl();
</span><span class="lines">@@ -838,7 +829,7 @@
</span><span class="cx"> unsigned m_refCount;
</span><span class="cx"> unsigned m_length;
</span><span class="cx"> const LChar* m_data8;
</span><del>- void* m_buffer;
</del><ins>+ mutable UChar* m_copyData16;
</ins><span class="cx"> unsigned m_hashAndFlags;
</span><span class="cx">
</span><span class="cx"> // These values mimic ConstructFromLiteral.
</span><span class="lines">@@ -864,14 +855,13 @@
</span><span class="cx"> const UChar* m_data16;
</span><span class="cx"> };
</span><span class="cx"> union {
</span><del>- void* m_buffer;
</del><span class="cx"> StringImpl* m_substringBuffer;
</span><span class="cx"> mutable UChar* m_copyData16;
</span><span class="cx"> };
</span><span class="cx"> mutable unsigned m_hashAndFlags;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-COMPILE_ASSERT(sizeof(StringImpl) == sizeof(StringImpl::StaticASCIILiteral), StringImpl_should_match_its_StaticASCIILiteral);
</del><ins>+static_assert(sizeof(StringImpl) == sizeof(StringImpl::StaticASCIILiteral), "");
</ins><span class="cx">
</span><span class="cx"> #if !ASSERT_DISABLED
</span><span class="cx"> // StringImpls created from StaticASCIILiteral will ASSERT
</span></span></pre>
</div>
</div>
</body>
</html>