<!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>[163398] 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/163398">163398</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-02-04 13:32:54 -0800 (Tue, 04 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename equalNonNull to equal and make it take const StringImpl& instead
https://bugs.webkit.org/show_bug.cgi?id=128206
Reviewed by Andreas Kling.
Source/WebCore:
* html/parser/HTMLParserIdioms.cpp:
(WebCore::threadSafeEqual):
(WebCore::threadSafeMatch):
Source/WTF:
* wtf/text/StringHash.h:
(WTF::StringHash::equal):
* wtf/text/StringImpl.cpp:
(WTF::stringImplContentEqual):
(WTF::equal):
* wtf/text/StringImpl.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtftextStringHashh">trunk/Source/WTF/wtf/text/StringHash.h</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>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlparserHTMLParserIdiomscpp">trunk/Source/WebCore/html/parser/HTMLParserIdioms.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (163397 => 163398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-02-04 21:27:19 UTC (rev 163397)
+++ trunk/Source/WTF/ChangeLog 2014-02-04 21:32:54 UTC (rev 163398)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2014-02-04 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Rename equalNonNull to equal and make it take const StringImpl& instead
+ https://bugs.webkit.org/show_bug.cgi?id=128206
+
+ Reviewed by Andreas Kling.
+
+ * wtf/text/StringHash.h:
+ (WTF::StringHash::equal):
+ * wtf/text/StringImpl.cpp:
+ (WTF::stringImplContentEqual):
+ (WTF::equal):
+ * wtf/text/StringImpl.h:
+
+2014-02-04 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Get rid of StringImpl::m_buffer
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=128200
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtftextStringHashh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringHash.h (163397 => 163398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringHash.h 2014-02-04 21:27:19 UTC (rev 163397)
+++ trunk/Source/WTF/wtf/text/StringHash.h 2014-02-04 21:32:54 UTC (rev 163398)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> static unsigned hash(StringImpl* key) { return key->hash(); }
</span><span class="cx"> static inline bool equal(const StringImpl* a, const StringImpl* b)
</span><span class="cx"> {
</span><del>- return equalNonNull(a, b);
</del><ins>+ return WTF::equal(*a, *b);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static unsigned hash(const RefPtr<StringImpl>& key) { return key->hash(); }
</span></span></pre></div>
<a id="trunkSourceWTFwtftextStringImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringImpl.cpp (163397 => 163398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringImpl.cpp 2014-02-04 21:27:19 UTC (rev 163397)
+++ trunk/Source/WTF/wtf/text/StringImpl.cpp 2014-02-04 21:32:54 UTC (rev 163398)
</span><span class="lines">@@ -1769,24 +1769,24 @@
</span><span class="cx"> return newImpl;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline bool stringImplContentEqual(const StringImpl* a, const StringImpl* b)
</del><ins>+static inline bool stringImplContentEqual(const StringImpl& a, const StringImpl& b)
</ins><span class="cx"> {
</span><del>- unsigned aLength = a->length();
- unsigned bLength = b->length();
</del><ins>+ unsigned aLength = a.length();
+ unsigned bLength = b.length();
</ins><span class="cx"> if (aLength != bLength)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (a->is8Bit()) {
- if (b->is8Bit())
- return equal(a->characters8(), b->characters8(), aLength);
</del><ins>+ if (a.is8Bit()) {
+ if (b.is8Bit())
+ return equal(a.characters8(), b.characters8(), aLength);
</ins><span class="cx">
</span><del>- return equal(a->characters8(), b->characters16(), aLength);
</del><ins>+ return equal(a.characters8(), b.characters16(), aLength);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (b->is8Bit())
- return equal(a->characters16(), b->characters8(), aLength);
</del><ins>+ if (b.is8Bit())
+ return equal(a.characters16(), b.characters8(), aLength);
</ins><span class="cx">
</span><del>- return equal(a->characters16(), b->characters16(), aLength);
</del><ins>+ return equal(a.characters16(), b.characters16(), aLength);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool equal(const StringImpl* a, const StringImpl* b)
</span><span class="lines">@@ -1796,7 +1796,7 @@
</span><span class="cx"> if (!a || !b)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- return stringImplContentEqual(a, b);
</del><ins>+ return stringImplContentEqual(*a, *b);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename CharType>
</span><span class="lines">@@ -1859,10 +1859,9 @@
</span><span class="cx"> return !b[length];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool equalNonNull(const StringImpl* a, const StringImpl* b)
</del><ins>+bool equal(const StringImpl& a, const StringImpl& b)
</ins><span class="cx"> {
</span><del>- ASSERT(a && b);
- if (a == b)
</del><ins>+ if (&a == &b)
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> return stringImplContentEqual(a, b);
</span></span></pre></div>
<a id="trunkSourceWTFwtftextStringImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringImpl.h (163397 => 163398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringImpl.h 2014-02-04 21:27:19 UTC (rev 163397)
+++ trunk/Source/WTF/wtf/text/StringImpl.h 2014-02-04 21:32:54 UTC (rev 163398)
</span><span class="lines">@@ -894,7 +894,7 @@
</span><span class="cx"> inline bool equal(const StringImpl* a, const char* b, unsigned length) { return equal(a, reinterpret_cast<const LChar*>(b), length); }
</span><span class="cx"> inline bool equal(const LChar* a, StringImpl* b) { return equal(b, a); }
</span><span class="cx"> inline bool equal(const char* a, StringImpl* b) { return equal(b, reinterpret_cast<const LChar*>(a)); }
</span><del>-WTF_EXPORT_STRING_API bool equalNonNull(const StringImpl* a, const StringImpl* b);
</del><ins>+WTF_EXPORT_STRING_API bool equal(const StringImpl& a, const StringImpl& b);
</ins><span class="cx">
</span><span class="cx"> // Do comparisons 8 or 4 bytes-at-a-time on architectures where it's safe.
</span><span class="cx"> #if CPU(X86_64) || CPU(ARM64)
</span><span class="lines">@@ -1379,7 +1379,6 @@
</span><span class="cx">
</span><span class="cx"> using WTF::StringImpl;
</span><span class="cx"> using WTF::equal;
</span><del>-using WTF::equalNonNull;
</del><span class="cx"> using WTF::TextCaseSensitivity;
</span><span class="cx"> using WTF::TextCaseSensitive;
</span><span class="cx"> using WTF::TextCaseInsensitive;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163397 => 163398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-04 21:27:19 UTC (rev 163397)
+++ trunk/Source/WebCore/ChangeLog 2014-02-04 21:32:54 UTC (rev 163398)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2014-02-04 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Rename equalNonNull to equal and make it take const StringImpl& instead
+ https://bugs.webkit.org/show_bug.cgi?id=128206
+
+ Reviewed by Andreas Kling.
+
+ * html/parser/HTMLParserIdioms.cpp:
+ (WebCore::threadSafeEqual):
+ (WebCore::threadSafeMatch):
+
+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="trunkSourceWebCorehtmlparserHTMLParserIdiomscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLParserIdioms.cpp (163397 => 163398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLParserIdioms.cpp 2014-02-04 21:27:19 UTC (rev 163397)
+++ trunk/Source/WebCore/html/parser/HTMLParserIdioms.cpp 2014-02-04 21:32:54 UTC (rev 163398)
</span><span class="lines">@@ -276,18 +276,18 @@
</span><span class="cx"> return parseHTMLNonNegativeIntegerInternal(start, start + length, value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool threadSafeEqual(const StringImpl* a, const StringImpl* b)
</del><ins>+static bool threadSafeEqual(const StringImpl& a, const StringImpl& b)
</ins><span class="cx"> {
</span><del>- if (a == b)
</del><ins>+ if (&a == &b)
</ins><span class="cx"> return true;
</span><del>- if (a->hash() != b->hash())
</del><ins>+ if (a.hash() != b.hash())
</ins><span class="cx"> return false;
</span><del>- return equalNonNull(a, b);
</del><ins>+ return equal(a, b);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool threadSafeMatch(const QualifiedName& a, const QualifiedName& b)
</span><span class="cx"> {
</span><del>- return threadSafeEqual(a.localName().impl(), b.localName().impl());
</del><ins>+ return threadSafeEqual(*a.localName().impl(), *b.localName().impl());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> struct ImageWithScale {
</span></span></pre>
</div>
</div>
</body>
</html>