<!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>[173648] 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/173648">173648</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-09-15 21:09:58 -0700 (Mon, 15 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use an AtomicString as key for caching ClassNodeList objects
https://bugs.webkit.org/show_bug.cgi?id=136830
Reviewed by Benjamin Poulain.
Use an AtomicString as key for caching ClassNodeList objects instead of
a String. ClassNodeList is the only type using a String instead of an
AtomicString as key in the cache HashTable. This brings some
complexity.
I believe this was done to avoid unnecessarily atomizing the String,
for performance reasons. However, at the moment, the String gets
atomized anyway when constructing the ClassNodeList object. This is
because the ClassNodeList::m_classNames member is of SpaceSplitString
type and the SpaceSplitString constructor takes an AtomicString in
argument.
Using an AtomicString to cache ClassNodeLists simplifies the code quite
a bit and decreases the size of NodeListsNodeData as well.
Test: fast/dom/getElementsByClassName/conflict-tag-name.html
* WebCore.order:
Remove symbol corresponding to addCacheWithName() as it was removed.
* dom/ClassNodeList.cpp:
(WebCore::ClassNodeList::~ClassNodeList):
Update the constructor to take an AtomicString in argument instead of
a String, for clarity. The String gets atomized when initializing
m_classNames anyway.
(WebCore::ClassNodeList::ClassNodeList):
Call removeCacheWithAtomicName() instead of removeCacheWithName() now
that m_originalClassNames is an AtomicString.
* dom/ClassNodeList.h:
Use AtomicString instead of String type for classNames, in both the
constructor argument and the m_originalClassNames data member.
* dom/ContainerNode.cpp:
(WebCore::ContainerNode::getElementsByClassName):
Call addCacheWithAtomicName() instead of addCacheWithName() now that
addCacheWithName() has been removed.
* dom/Node.cpp:
(WebCore::NodeListsNodeData::invalidateCaches):
Stop invalidating m_nameCaches as this HashMap no longer exists.
* dom/NodeRareData.h:
(WebCore::NodeListsNodeData::NodeListCacheMapEntryHash::hash):
(WebCore::NodeListsNodeData::NodeListCacheMapEntryHash::equal):
(WebCore::NodeListsNodeData::isEmpty):
(WebCore::NodeListsNodeData::adoptDocument):
(WebCore::NodeListsNodeData::namedNodeListKey):
(WebCore::NodeListsNodeData::deleteThisAndUpdateNodeRareDataIfAboutToRemoveLastList):
(WebCore::NodeListsNodeData::addCacheWithName): Deleted.
(WebCore::NodeListsNodeData::removeCacheWithName): Deleted.
- Drop addCacheWithName() / removeCacheWithName() now that no NodeList
uses a String as HashMap key.
- Drop m_nameCaches now that ClassNodeLists are cached in
m_atomicNameCaches instead.
- Remove StringType template parameter and hardcode AtomicString
instead.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreorder">trunk/Source/WebCore/WebCore.order</a></li>
<li><a href="#trunkSourceWebCoredomClassNodeListcpp">trunk/Source/WebCore/dom/ClassNodeList.cpp</a></li>
<li><a href="#trunkSourceWebCoredomClassNodeListh">trunk/Source/WebCore/dom/ClassNodeList.h</a></li>
<li><a href="#trunkSourceWebCoredomContainerNodecpp">trunk/Source/WebCore/dom/ContainerNode.cpp</a></li>
<li><a href="#trunkSourceWebCoredomContainerNodeh">trunk/Source/WebCore/dom/ContainerNode.h</a></li>
<li><a href="#trunkSourceWebCoredomNodecpp">trunk/Source/WebCore/dom/Node.cpp</a></li>
<li><a href="#trunkSourceWebCoredomNodeRareDatah">trunk/Source/WebCore/dom/NodeRareData.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastdomgetElementsByClassNameconflicttagnameexpectedtxt">trunk/LayoutTests/fast/dom/getElementsByClassName/conflict-tag-name-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomgetElementsByClassNameconflicttagnamehtml">trunk/LayoutTests/fast/dom/getElementsByClassName/conflict-tag-name.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsfastdomgetElementsByClassNameconflicttagnameexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/getElementsByClassName/conflict-tag-name-expected.txt (0 => 173648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/getElementsByClassName/conflict-tag-name-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/dom/getElementsByClassName/conflict-tag-name-expected.txt 2014-09-16 04:09:58 UTC (rev 173648)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+Checks that getElementsByClassName('foo') and getElementsByTagName('foo') do not conflict
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS withFooTag.length is 1
+PASS withFooTag[0].id is "a"
+PASS withFooClass.length is 1
+PASS withFooClass[0].id is "b"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastdomgetElementsByClassNameconflicttagnamehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/getElementsByClassName/conflict-tag-name.html (0 => 173648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/getElementsByClassName/conflict-tag-name.html (rev 0)
+++ trunk/LayoutTests/fast/dom/getElementsByClassName/conflict-tag-name.html 2014-09-16 04:09:58 UTC (rev 173648)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+<!DOCTYPE html>
+<script src="../../../resources/js-test.js"></script>
+
+<foo id="a"></foo>
+<div id="b" class="foo"></div>
+
+<script>
+description("Checks that getElementsByClassName('foo') and getElementsByTagName('foo') do not conflict");
+
+var withFooTag = document.getElementsByTagName("foo");
+shouldBe("withFooTag.length", "1");
+shouldBeEqualToString("withFooTag[0].id", "a");
+
+var withFooClass = document.getElementsByClassName("foo");
+shouldBe("withFooClass.length", "1");
+shouldBeEqualToString("withFooClass[0].id", "b");
+</script>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173647 => 173648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-16 03:50:13 UTC (rev 173647)
+++ trunk/Source/WebCore/ChangeLog 2014-09-16 04:09:58 UTC (rev 173648)
</span><span class="lines">@@ -1,5 +1,71 @@
</span><span class="cx"> 2014-09-15 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Use an AtomicString as key for caching ClassNodeList objects
+ https://bugs.webkit.org/show_bug.cgi?id=136830
+
+ Reviewed by Benjamin Poulain.
+
+ Use an AtomicString as key for caching ClassNodeList objects instead of
+ a String. ClassNodeList is the only type using a String instead of an
+ AtomicString as key in the cache HashTable. This brings some
+ complexity.
+
+ I believe this was done to avoid unnecessarily atomizing the String,
+ for performance reasons. However, at the moment, the String gets
+ atomized anyway when constructing the ClassNodeList object. This is
+ because the ClassNodeList::m_classNames member is of SpaceSplitString
+ type and the SpaceSplitString constructor takes an AtomicString in
+ argument.
+
+ Using an AtomicString to cache ClassNodeLists simplifies the code quite
+ a bit and decreases the size of NodeListsNodeData as well.
+
+ Test: fast/dom/getElementsByClassName/conflict-tag-name.html
+
+ * WebCore.order:
+ Remove symbol corresponding to addCacheWithName() as it was removed.
+
+ * dom/ClassNodeList.cpp:
+ (WebCore::ClassNodeList::~ClassNodeList):
+ Update the constructor to take an AtomicString in argument instead of
+ a String, for clarity. The String gets atomized when initializing
+ m_classNames anyway.
+
+ (WebCore::ClassNodeList::ClassNodeList):
+ Call removeCacheWithAtomicName() instead of removeCacheWithName() now
+ that m_originalClassNames is an AtomicString.
+
+ * dom/ClassNodeList.h:
+ Use AtomicString instead of String type for classNames, in both the
+ constructor argument and the m_originalClassNames data member.
+
+ * dom/ContainerNode.cpp:
+ (WebCore::ContainerNode::getElementsByClassName):
+ Call addCacheWithAtomicName() instead of addCacheWithName() now that
+ addCacheWithName() has been removed.
+
+ * dom/Node.cpp:
+ (WebCore::NodeListsNodeData::invalidateCaches):
+ Stop invalidating m_nameCaches as this HashMap no longer exists.
+
+ * dom/NodeRareData.h:
+ (WebCore::NodeListsNodeData::NodeListCacheMapEntryHash::hash):
+ (WebCore::NodeListsNodeData::NodeListCacheMapEntryHash::equal):
+ (WebCore::NodeListsNodeData::isEmpty):
+ (WebCore::NodeListsNodeData::adoptDocument):
+ (WebCore::NodeListsNodeData::namedNodeListKey):
+ (WebCore::NodeListsNodeData::deleteThisAndUpdateNodeRareDataIfAboutToRemoveLastList):
+ (WebCore::NodeListsNodeData::addCacheWithName): Deleted.
+ (WebCore::NodeListsNodeData::removeCacheWithName): Deleted.
+ - Drop addCacheWithName() / removeCacheWithName() now that no NodeList
+ uses a String as HashMap key.
+ - Drop m_nameCaches now that ClassNodeLists are cached in
+ m_atomicNameCaches instead.
+ - Remove StringType template parameter and hardcode AtomicString
+ instead.
+
+2014-09-15 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Return early in SelectorChecker::checkOne() if selector.isAttributeSelector() is true
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=136838
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreorder"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.order (173647 => 173648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.order 2014-09-16 03:50:13 UTC (rev 173647)
+++ trunk/Source/WebCore/WebCore.order 2014-09-16 04:09:58 UTC (rev 173648)
</span><span class="lines">@@ -6140,7 +6140,6 @@
</span><span class="cx"> __ZN3JSC21getStaticPropertySlotIN7WebCore27JSDOMCoreExceptionPrototypeENS_8JSObjectEEEbPNS_9ExecStateEPKNS_9HashTableEPT_NS_12PropertyNameERNS_12PropertySlotE
</span><span class="cx"> __ZN7WebCore48jsElementPrototypeFunctionGetElementsByClassNameEPN3JSC9ExecStateE
</span><span class="cx"> __ZN7WebCore4Node22getElementsByClassNameERKN3WTF6StringE
</span><del>-__ZN7WebCore17NodeListsNodeData16addCacheWithNameINS_13ClassNodeListEEEN3WTF10PassRefPtrIT_EEPNS_4NodeENS_14CollectionTypeERKNS3_6StringE
</del><span class="cx"> __ZN7WebCore13ClassNodeListC1EN3WTF10PassRefPtrINS_4NodeEEERKNS1_6StringE
</span><span class="cx"> __ZN7WebCore13ClassNodeListC2EN3WTF10PassRefPtrINS_4NodeEEERKNS1_6StringE
</span><span class="cx"> __ZN7WebCore20firstMatchingElementINS_13ClassNodeListEEEPNS_7ElementEPKT_PNS_13ContainerNodeE
</span></span></pre></div>
<a id="trunkSourceWebCoredomClassNodeListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ClassNodeList.cpp (173647 => 173648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ClassNodeList.cpp 2014-09-16 03:50:13 UTC (rev 173647)
+++ trunk/Source/WebCore/dom/ClassNodeList.cpp 2014-09-16 04:09:58 UTC (rev 173648)
</span><span class="lines">@@ -35,16 +35,14 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-ClassNodeList::ClassNodeList(ContainerNode& rootNode, const String& classNames)
- : CachedLiveNodeList(rootNode, InvalidateOnClassAttrChange)
- , m_classNames(classNames, document().inQuirksMode())
- , m_originalClassNames(classNames)
</del><ins>+PassRef<ClassNodeList> ClassNodeList::create(ContainerNode& rootNode, const AtomicString& classNames)
</ins><span class="cx"> {
</span><ins>+ return adoptRef(*new ClassNodeList(rootNode, classNames));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ClassNodeList::~ClassNodeList()
</span><span class="cx"> {
</span><del>- ownerNode().nodeLists()->removeCacheWithName(this, m_originalClassNames);
</del><ins>+ ownerNode().nodeLists()->removeCacheWithAtomicName(this, m_originalClassNames);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoredomClassNodeListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ClassNodeList.h (173647 => 173648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ClassNodeList.h 2014-09-16 03:50:13 UTC (rev 173647)
+++ trunk/Source/WebCore/dom/ClassNodeList.h 2014-09-16 04:09:58 UTC (rev 173648)
</span><span class="lines">@@ -39,10 +39,7 @@
</span><span class="cx">
</span><span class="cx"> class ClassNodeList final : public CachedLiveNodeList<ClassNodeList> {
</span><span class="cx"> public:
</span><del>- static PassRef<ClassNodeList> create(ContainerNode& rootNode, const String& classNames)
- {
- return adoptRef(*new ClassNodeList(rootNode, classNames));
- }
</del><ins>+ static PassRef<ClassNodeList> create(ContainerNode&, const AtomicString& classNames);
</ins><span class="cx">
</span><span class="cx"> virtual ~ClassNodeList();
</span><span class="cx">
</span><span class="lines">@@ -50,12 +47,19 @@
</span><span class="cx"> virtual bool isRootedAtDocument() const override { return false; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- ClassNodeList(ContainerNode& rootNode, const String& classNames);
</del><ins>+ ClassNodeList(ContainerNode& rootNode, const AtomicString& classNames);
</ins><span class="cx">
</span><span class="cx"> SpaceSplitString m_classNames;
</span><del>- String m_originalClassNames;
</del><ins>+ AtomicString m_originalClassNames;
</ins><span class="cx"> };
</span><span class="cx">
</span><ins>+inline ClassNodeList::ClassNodeList(ContainerNode& rootNode, const AtomicString& classNames)
+ : CachedLiveNodeList(rootNode, InvalidateOnClassAttrChange)
+ , m_classNames(classNames, document().inQuirksMode())
+ , m_originalClassNames(classNames)
+{
+}
+
</ins><span class="cx"> inline bool ClassNodeList::nodeMatches(Element* element) const
</span><span class="cx"> {
</span><span class="cx"> if (!element->hasClass())
</span></span></pre></div>
<a id="trunkSourceWebCoredomContainerNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ContainerNode.cpp (173647 => 173648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ContainerNode.cpp 2014-09-16 03:50:13 UTC (rev 173647)
+++ trunk/Source/WebCore/dom/ContainerNode.cpp 2014-09-16 04:09:58 UTC (rev 173648)
</span><span class="lines">@@ -1054,9 +1054,9 @@
</span><span class="cx"> return ensureRareData().ensureNodeLists().addCacheWithAtomicName<NameNodeList>(*this, elementName);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<NodeList> ContainerNode::getElementsByClassName(const String& classNames)
</del><ins>+PassRefPtr<NodeList> ContainerNode::getElementsByClassName(const AtomicString& classNames)
</ins><span class="cx"> {
</span><del>- return ensureRareData().ensureNodeLists().addCacheWithName<ClassNodeList>(*this, classNames);
</del><ins>+ return ensureRareData().ensureNodeLists().addCacheWithAtomicName<ClassNodeList>(*this, classNames);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<RadioNodeList> ContainerNode::radioNodeList(const AtomicString& name)
</span></span></pre></div>
<a id="trunkSourceWebCoredomContainerNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ContainerNode.h (173647 => 173648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ContainerNode.h 2014-09-16 03:50:13 UTC (rev 173647)
+++ trunk/Source/WebCore/dom/ContainerNode.h 2014-09-16 04:09:58 UTC (rev 173648)
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx"> PassRefPtr<NodeList> getElementsByTagName(const AtomicString&);
</span><span class="cx"> PassRefPtr<NodeList> getElementsByTagNameNS(const AtomicString& namespaceURI, const AtomicString& localName);
</span><span class="cx"> PassRefPtr<NodeList> getElementsByName(const String& elementName);
</span><del>- PassRefPtr<NodeList> getElementsByClassName(const String& classNames);
</del><ins>+ PassRefPtr<NodeList> getElementsByClassName(const AtomicString& classNames);
</ins><span class="cx"> PassRefPtr<RadioNodeList> radioNodeList(const AtomicString&);
</span><span class="cx">
</span><span class="cx"> protected:
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.cpp (173647 => 173648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.cpp 2014-09-16 03:50:13 UTC (rev 173647)
+++ trunk/Source/WebCore/dom/Node.cpp 2014-09-16 04:09:58 UTC (rev 173648)
</span><span class="lines">@@ -1695,9 +1695,6 @@
</span><span class="cx"> for (auto& atomicName : m_atomicNameCaches)
</span><span class="cx"> atomicName.value->invalidateCacheForAttribute(attrName);
</span><span class="cx">
</span><del>- for (auto& name : m_nameCaches)
- name.value->invalidateCacheForAttribute(attrName);
-
</del><span class="cx"> for (auto& collection : m_cachedCollections)
</span><span class="cx"> collection.value->invalidateCache(attrName);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodeRareDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/NodeRareData.h (173647 => 173648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/NodeRareData.h 2014-09-16 03:50:13 UTC (rev 173647)
+++ trunk/Source/WebCore/dom/NodeRareData.h 2014-09-16 04:09:58 UTC (rev 173648)
</span><span class="lines">@@ -35,7 +35,6 @@
</span><span class="cx"> #include "TagNodeList.h"
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/text/AtomicString.h>
</span><del>-#include <wtf/text/StringHash.h>
</del><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> #include "TextTrack.h"
</span><span class="lines">@@ -106,19 +105,17 @@
</span><span class="cx"> m_emptyChildNodeList = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- template <typename StringType>
</del><span class="cx"> struct NodeListCacheMapEntryHash {
</span><del>- static unsigned hash(const std::pair<unsigned char, StringType>& entry)
</del><ins>+ static unsigned hash(const std::pair<unsigned char, AtomicString>& entry)
</ins><span class="cx"> {
</span><del>- return DefaultHash<StringType>::Hash::hash(entry.second) + entry.first;
</del><ins>+ return DefaultHash<AtomicString>::Hash::hash(entry.second) + entry.first;
</ins><span class="cx"> }
</span><del>- static bool equal(const std::pair<unsigned char, StringType>& a, const std::pair<unsigned char, StringType>& b) { return a.first == b.first && DefaultHash<StringType>::Hash::equal(a.second, b.second); }
- static const bool safeToCompareToEmptyOrDeleted = DefaultHash<StringType>::Hash::safeToCompareToEmptyOrDeleted;
</del><ins>+ static bool equal(const std::pair<unsigned char, AtomicString>& a, const std::pair<unsigned char, AtomicString>& b) { return a.first == b.first && DefaultHash<AtomicString>::Hash::equal(a.second, b.second); }
+ static const bool safeToCompareToEmptyOrDeleted = DefaultHash<AtomicString>::Hash::safeToCompareToEmptyOrDeleted;
</ins><span class="cx"> };
</span><span class="cx">
</span><del>- typedef HashMap<std::pair<unsigned char, AtomicString>, LiveNodeList*, NodeListCacheMapEntryHash<AtomicString>> NodeListAtomicNameCacheMap;
- typedef HashMap<std::pair<unsigned char, String>, LiveNodeList*, NodeListCacheMapEntryHash<String>> NodeListNameCacheMap;
- typedef HashMap<std::pair<unsigned char, AtomicString>, HTMLCollection*, NodeListCacheMapEntryHash<AtomicString>> CollectionCacheMap;
</del><ins>+ typedef HashMap<std::pair<unsigned char, AtomicString>, LiveNodeList*, NodeListCacheMapEntryHash> NodeListAtomicNameCacheMap;
+ typedef HashMap<std::pair<unsigned char, AtomicString>, HTMLCollection*, NodeListCacheMapEntryHash> CollectionCacheMap;
</ins><span class="cx"> typedef HashMap<QualifiedName, TagNodeList*> TagNodeListCacheNS;
</span><span class="cx">
</span><span class="cx"> template<typename T, typename ContainerType>
</span><span class="lines">@@ -133,18 +130,6 @@
</span><span class="cx"> return list;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- template<typename T>
- ALWAYS_INLINE PassRef<T> addCacheWithName(ContainerNode& node, const String& name)
- {
- NodeListNameCacheMap::AddResult result = m_nameCaches.fastAdd(namedNodeListKey<T>(name), nullptr);
- if (!result.isNewEntry)
- return static_cast<T&>(*result.iterator->value);
-
- auto list = T::create(node, name);
- result.iterator->value = &list.get();
- return list;
- }
-
</del><span class="cx"> ALWAYS_INLINE PassRef<TagNodeList> addCacheWithQualifiedName(ContainerNode& node, const AtomicString& namespaceURI, const AtomicString& localName)
</span><span class="cx"> {
</span><span class="cx"> QualifiedName name(nullAtom, localName, namespaceURI);
</span><span class="lines">@@ -196,15 +181,6 @@
</span><span class="cx"> m_atomicNameCaches.remove(namedNodeListKey<NodeListType>(name));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- template <class NodeListType>
- void removeCacheWithName(NodeListType* list, const String& name)
- {
- ASSERT(list == m_nameCaches.get(namedNodeListKey<NodeListType>(name)));
- if (deleteThisAndUpdateNodeRareDataIfAboutToRemoveLastList(list->ownerNode()))
- return;
- m_nameCaches.remove(namedNodeListKey<NodeListType>(name));
- }
-
</del><span class="cx"> void removeCacheWithQualifiedName(LiveNodeList* list, const AtomicString& namespaceURI, const AtomicString& localName)
</span><span class="cx"> {
</span><span class="cx"> QualifiedName name(nullAtom, localName, namespaceURI);
</span><span class="lines">@@ -225,7 +201,7 @@
</span><span class="cx"> void invalidateCaches(const QualifiedName* attrName = 0);
</span><span class="cx"> bool isEmpty() const
</span><span class="cx"> {
</span><del>- return m_atomicNameCaches.isEmpty() && m_nameCaches.isEmpty() && m_cachedCollections.isEmpty() && m_tagNodeListCacheNS.isEmpty();
</del><ins>+ return m_atomicNameCaches.isEmpty() && m_cachedCollections.isEmpty() && m_tagNodeListCacheNS.isEmpty();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void adoptTreeScope()
</span><span class="lines">@@ -244,9 +220,6 @@
</span><span class="cx"> for (auto& cache : m_atomicNameCaches.values())
</span><span class="cx"> cache->invalidateCache(*oldDocument);
</span><span class="cx">
</span><del>- for (auto& cache : m_nameCaches.values())
- cache->invalidateCache(*oldDocument);
-
</del><span class="cx"> for (auto& list : m_tagNodeListCacheNS.values()) {
</span><span class="cx"> ASSERT(!list->isRootedAtDocument());
</span><span class="cx"> list->invalidateCache(*oldDocument);
</span><span class="lines">@@ -263,9 +236,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <class NodeListType>
</span><del>- std::pair<unsigned char, String> namedNodeListKey(const String& name)
</del><ins>+ std::pair<unsigned char, AtomicString> namedNodeListKey(const AtomicString& name)
</ins><span class="cx"> {
</span><del>- return std::pair<unsigned char, String>(NodeListTypeIdentifier<NodeListType>::value(), name);
</del><ins>+ return std::pair<unsigned char, AtomicString>(NodeListTypeIdentifier<NodeListType>::value(), name);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool deleteThisAndUpdateNodeRareDataIfAboutToRemoveLastList(Node&);
</span><span class="lines">@@ -275,7 +248,6 @@
</span><span class="cx"> EmptyNodeList* m_emptyChildNodeList;
</span><span class="cx">
</span><span class="cx"> NodeListAtomicNameCacheMap m_atomicNameCaches;
</span><del>- NodeListNameCacheMap m_nameCaches;
</del><span class="cx"> TagNodeListCacheNS m_tagNodeListCacheNS;
</span><span class="cx"> CollectionCacheMap m_cachedCollections;
</span><span class="cx"> };
</span><span class="lines">@@ -336,7 +308,7 @@
</span><span class="cx"> inline bool NodeListsNodeData::deleteThisAndUpdateNodeRareDataIfAboutToRemoveLastList(Node& ownerNode)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(ownerNode.nodeLists() == this);
</span><del>- if ((m_childNodeList ? 1 : 0) + (m_emptyChildNodeList ? 1 : 0) + m_atomicNameCaches.size() + m_nameCaches.size()
</del><ins>+ if ((m_childNodeList ? 1 : 0) + (m_emptyChildNodeList ? 1 : 0) + m_atomicNameCaches.size()
</ins><span class="cx"> + m_tagNodeListCacheNS.size() + m_cachedCollections.size() != 1)
</span><span class="cx"> return false;
</span><span class="cx"> ownerNode.clearNodeLists();
</span></span></pre>
</div>
</div>
</body>
</html>