<!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>[192920] trunk</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/192920">192920</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2015-12-01 15:30:03 -0800 (Tue, 01 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Give String and AtomicString an existingHash() function
https://bugs.webkit.org/show_bug.cgi?id=151717
Reviewed by Andreas Kling.
Source/WebCore:
No new tests because there is no behavior change.
* platform/graphics/Font.cpp:
(WebCore::CharacterFallbackMapKeyHash::hash):
Source/WTF:
Test: WTF.AtomicStringExistingHash
WTF.StringExistingHash
* wtf/text/AtomicString.h:
(WTF::AtomicString::existingHash):
* wtf/text/WTFString.h:
(WTF::String::existingHash):
Tools:
* TestWebKitAPI/Tests/WTF/AtomicString.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WTF/WTFString.cpp:
(TestWebKitAPI::TEST):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtftextAtomicStringh">trunk/Source/WTF/wtf/text/AtomicString.h</a></li>
<li><a href="#trunkSourceWTFwtftextWTFStringh">trunk/Source/WTF/wtf/text/WTFString.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontcpp">trunk/Source/WebCore/platform/graphics/Font.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFAtomicStringcpp">trunk/Tools/TestWebKitAPI/Tests/WTF/AtomicString.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFWTFStringcpp">trunk/Tools/TestWebKitAPI/Tests/WTF/WTFString.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (192919 => 192920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-12-01 22:47:00 UTC (rev 192919)
+++ trunk/Source/WTF/ChangeLog 2015-12-01 23:30:03 UTC (rev 192920)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-12-01 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Give String and AtomicString an existingHash() function
+ https://bugs.webkit.org/show_bug.cgi?id=151717
+
+ Reviewed by Andreas Kling.
+
+ Test: WTF.AtomicStringExistingHash
+ WTF.StringExistingHash
+
+ * wtf/text/AtomicString.h:
+ (WTF::AtomicString::existingHash):
+ * wtf/text/WTFString.h:
+ (WTF::String::existingHash):
+
</ins><span class="cx"> 2015-12-01 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [ES6] Implement LLInt/Baseline Support for ES6 Generators and enable this feature
</span></span></pre></div>
<a id="trunkSourceWTFwtftextAtomicStringh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/AtomicString.h (192919 => 192920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/AtomicString.h 2015-12-01 22:47:00 UTC (rev 192919)
+++ trunk/Source/WTF/wtf/text/AtomicString.h 2015-12-01 23:30:03 UTC (rev 192920)
</span><span class="lines">@@ -88,6 +88,8 @@
</span><span class="cx"> AtomicString(WTF::HashTableDeletedValueType) : m_string(WTF::HashTableDeletedValue) { }
</span><span class="cx"> bool isHashTableDeletedValue() const { return m_string.isHashTableDeletedValue(); }
</span><span class="cx">
</span><ins>+ unsigned existingHash() const { return isNull() ? 0 : impl()->existingHash(); }
+
</ins><span class="cx"> operator const String&() const { return m_string; }
</span><span class="cx"> const String& string() const { return m_string; };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtftextWTFStringh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/WTFString.h (192919 => 192920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/WTFString.h 2015-12-01 22:47:00 UTC (rev 192919)
+++ trunk/Source/WTF/wtf/text/WTFString.h 2015-12-01 23:30:03 UTC (rev 192920)
</span><span class="lines">@@ -463,6 +463,8 @@
</span><span class="cx"> String(WTF::HashTableDeletedValueType) : m_impl(WTF::HashTableDeletedValue) { }
</span><span class="cx"> bool isHashTableDeletedValue() const { return m_impl.isHashTableDeletedValue(); }
</span><span class="cx">
</span><ins>+ unsigned existingHash() const { return isNull() ? 0 : impl()->existingHash(); }
+
</ins><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> WTF_EXPORT_STRING_API void show() const;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192919 => 192920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-12-01 22:47:00 UTC (rev 192919)
+++ trunk/Source/WebCore/ChangeLog 2015-12-01 23:30:03 UTC (rev 192920)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2015-12-01 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><ins>+ Give String and AtomicString an existingHash() function
+ https://bugs.webkit.org/show_bug.cgi?id=151717
+
+ Reviewed by Andreas Kling.
+
+ No new tests because there is no behavior change.
+
+ * platform/graphics/Font.cpp:
+ (WebCore::CharacterFallbackMapKeyHash::hash):
+
+2015-12-01 Myles C. Maxfield <mmaxfield@apple.com>
+
</ins><span class="cx"> [Win] Build fix after r192895
</span><span class="cx">
</span><span class="cx"> Unreviewed.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Font.cpp (192919 => 192920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Font.cpp 2015-12-01 22:47:00 UTC (rev 192919)
+++ trunk/Source/WebCore/platform/graphics/Font.cpp 2015-12-01 23:30:03 UTC (rev 192920)
</span><span class="lines">@@ -426,7 +426,7 @@
</span><span class="cx"> IntegerHasher hasher;
</span><span class="cx"> hasher.add(key.character);
</span><span class="cx"> hasher.add(key.isForPlatformFont);
</span><del>- hasher.add(key.locale.isNull() ? 0 : key.locale.impl()->existingHash());
</del><ins>+ hasher.add(key.locale.existingHash());
</ins><span class="cx"> return hasher.hash();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (192919 => 192920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-12-01 22:47:00 UTC (rev 192919)
+++ trunk/Tools/ChangeLog 2015-12-01 23:30:03 UTC (rev 192920)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-12-01 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Give String and AtomicString an existingHash() function
+ https://bugs.webkit.org/show_bug.cgi?id=151717
+
+ Reviewed by Andreas Kling.
+
+ * TestWebKitAPI/Tests/WTF/AtomicString.cpp:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WTF/WTFString.cpp:
+ (TestWebKitAPI::TEST):
+
</ins><span class="cx"> 2015-12-01 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [ES6] Implement LLInt/Baseline Support for ES6 Generators and enable this feature
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFAtomicStringcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/AtomicString.cpp (192919 => 192920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/AtomicString.cpp 2015-12-01 22:47:00 UTC (rev 192919)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/AtomicString.cpp 2015-12-01 23:30:03 UTC (rev 192920)
</span><span class="lines">@@ -53,4 +53,12 @@
</span><span class="cx"> ASSERT_EQ(string1.impl(), string3.impl());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TEST(WTF, AtomicStringExistingHash)
+{
+ AtomicString string1("Template Literal", AtomicString::ConstructFromLiteral);
+ ASSERT_EQ(string1.existingHash(), string1.impl()->existingHash());
+ AtomicString string2;
+ ASSERT_EQ(string2.existingHash(), 0u);
+}
+
</ins><span class="cx"> } // namespace TestWebKitAPI
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFWTFStringcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/WTFString.cpp (192919 => 192920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/WTFString.cpp 2015-12-01 22:47:00 UTC (rev 192919)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/WTFString.cpp 2015-12-01 23:30:03 UTC (rev 192920)
</span><span class="lines">@@ -281,4 +281,15 @@
</span><span class="cx"> EXPECT_FALSE(String("Test").hasInfixStartingAt(String::fromUTF8("δΈ"), 2));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TEST(WTF, StringExistingHash)
+{
+ String string1("Template Literal");
+ ASSERT_FALSE(string1.isNull());
+ ASSERT_FALSE(string1.impl()->hasHash());
+ string1.impl()->hash();
+ ASSERT_EQ(string1.existingHash(), string1.impl()->existingHash());
+ String string2;
+ ASSERT_EQ(string2.existingHash(), 0u);
+}
+
</ins><span class="cx"> } // namespace TestWebKitAPI
</span></span></pre>
</div>
</div>
</body>
</html>