<!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>[166377] trunk/Source/WebCore</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/166377">166377</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2014-03-27 15:47:15 -0700 (Thu, 27 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove LiveNodeList::Type
https://bugs.webkit.org/show_bug.cgi?id=130866
Reviewed by Andreas Kling.
We don't need dynamic type information anymore.
* dom/ClassNodeList.cpp:
(WebCore::ClassNodeList::ClassNodeList):
* dom/ContainerNode.cpp:
(WebCore::ContainerNode::getElementsByTagName):
(WebCore::ContainerNode::getElementsByName):
(WebCore::ContainerNode::getElementsByClassName):
(WebCore::ContainerNode::radioNodeList):
* dom/LiveNodeList.cpp:
(WebCore::LiveNodeList::LiveNodeList):
* dom/LiveNodeList.h:
(WebCore::LiveNodeList::invalidationType):
(WebCore::CachedLiveNodeList<NodeListType>::CachedLiveNodeList):
(WebCore::LiveNodeList::type): Deleted.
* dom/NameNodeList.cpp:
(WebCore::NameNodeList::NameNodeList):
(WebCore::NameNodeList::nodeMatches): Deleted.
* dom/NameNodeList.h:
(WebCore::NameNodeList::nodeMatches):
* dom/NodeRareData.h:
(WebCore::NodeListTypeIdentifier<ClassNodeList>::value):
(WebCore::NodeListTypeIdentifier<NameNodeList>::value):
(WebCore::NodeListTypeIdentifier<TagNodeList>::value):
(WebCore::NodeListTypeIdentifier<HTMLTagNodeList>::value):
(WebCore::NodeListTypeIdentifier<RadioNodeList>::value):
(WebCore::NodeListTypeIdentifier<LabelsNodeList>::value):
Get unique id from type for key generation purposes only.
(WebCore::NodeListsNodeData::addCacheWithAtomicName):
(WebCore::NodeListsNodeData::addCacheWithName):
(WebCore::NodeListsNodeData::removeCacheWithAtomicName):
(WebCore::NodeListsNodeData::removeCacheWithName):
(WebCore::NodeListsNodeData::namedNodeListKey):
* dom/TagNodeList.cpp:
(WebCore::TagNodeList::TagNodeList):
(WebCore::HTMLTagNodeList::HTMLTagNodeList):
* dom/TagNodeList.h:
* html/LabelableElement.cpp:
(WebCore::LabelableElement::labels):
* html/LabelsNodeList.cpp:
(WebCore::LabelsNodeList::LabelsNodeList):
* html/LabelsNodeList.h:
* html/RadioNodeList.cpp:
(WebCore::RadioNodeList::RadioNodeList):
* html/RadioNodeList.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomClassNodeListcpp">trunk/Source/WebCore/dom/ClassNodeList.cpp</a></li>
<li><a href="#trunkSourceWebCoredomContainerNodecpp">trunk/Source/WebCore/dom/ContainerNode.cpp</a></li>
<li><a href="#trunkSourceWebCoredomLiveNodeListcpp">trunk/Source/WebCore/dom/LiveNodeList.cpp</a></li>
<li><a href="#trunkSourceWebCoredomLiveNodeListh">trunk/Source/WebCore/dom/LiveNodeList.h</a></li>
<li><a href="#trunkSourceWebCoredomNameNodeListcpp">trunk/Source/WebCore/dom/NameNodeList.cpp</a></li>
<li><a href="#trunkSourceWebCoredomNameNodeListh">trunk/Source/WebCore/dom/NameNodeList.h</a></li>
<li><a href="#trunkSourceWebCoredomNodeRareDatah">trunk/Source/WebCore/dom/NodeRareData.h</a></li>
<li><a href="#trunkSourceWebCoredomTagNodeListcpp">trunk/Source/WebCore/dom/TagNodeList.cpp</a></li>
<li><a href="#trunkSourceWebCoredomTagNodeListh">trunk/Source/WebCore/dom/TagNodeList.h</a></li>
<li><a href="#trunkSourceWebCorehtmlLabelableElementcpp">trunk/Source/WebCore/html/LabelableElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlLabelsNodeListcpp">trunk/Source/WebCore/html/LabelsNodeList.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlLabelsNodeListh">trunk/Source/WebCore/html/LabelsNodeList.h</a></li>
<li><a href="#trunkSourceWebCorehtmlRadioNodeListcpp">trunk/Source/WebCore/html/RadioNodeList.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlRadioNodeListh">trunk/Source/WebCore/html/RadioNodeList.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166376 => 166377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-27 22:39:00 UTC (rev 166376)
+++ trunk/Source/WebCore/ChangeLog 2014-03-27 22:47:15 UTC (rev 166377)
</span><span class="lines">@@ -1,3 +1,58 @@
</span><ins>+2014-03-27 Antti Koivisto <antti@apple.com>
+
+ Remove LiveNodeList::Type
+ https://bugs.webkit.org/show_bug.cgi?id=130866
+
+ Reviewed by Andreas Kling.
+
+ We don't need dynamic type information anymore.
+
+ * dom/ClassNodeList.cpp:
+ (WebCore::ClassNodeList::ClassNodeList):
+ * dom/ContainerNode.cpp:
+ (WebCore::ContainerNode::getElementsByTagName):
+ (WebCore::ContainerNode::getElementsByName):
+ (WebCore::ContainerNode::getElementsByClassName):
+ (WebCore::ContainerNode::radioNodeList):
+ * dom/LiveNodeList.cpp:
+ (WebCore::LiveNodeList::LiveNodeList):
+ * dom/LiveNodeList.h:
+ (WebCore::LiveNodeList::invalidationType):
+ (WebCore::CachedLiveNodeList<NodeListType>::CachedLiveNodeList):
+ (WebCore::LiveNodeList::type): Deleted.
+ * dom/NameNodeList.cpp:
+ (WebCore::NameNodeList::NameNodeList):
+ (WebCore::NameNodeList::nodeMatches): Deleted.
+ * dom/NameNodeList.h:
+ (WebCore::NameNodeList::nodeMatches):
+ * dom/NodeRareData.h:
+ (WebCore::NodeListTypeIdentifier<ClassNodeList>::value):
+ (WebCore::NodeListTypeIdentifier<NameNodeList>::value):
+ (WebCore::NodeListTypeIdentifier<TagNodeList>::value):
+ (WebCore::NodeListTypeIdentifier<HTMLTagNodeList>::value):
+ (WebCore::NodeListTypeIdentifier<RadioNodeList>::value):
+ (WebCore::NodeListTypeIdentifier<LabelsNodeList>::value):
+
+ Get unique id from type for key generation purposes only.
+
+ (WebCore::NodeListsNodeData::addCacheWithAtomicName):
+ (WebCore::NodeListsNodeData::addCacheWithName):
+ (WebCore::NodeListsNodeData::removeCacheWithAtomicName):
+ (WebCore::NodeListsNodeData::removeCacheWithName):
+ (WebCore::NodeListsNodeData::namedNodeListKey):
+ * dom/TagNodeList.cpp:
+ (WebCore::TagNodeList::TagNodeList):
+ (WebCore::HTMLTagNodeList::HTMLTagNodeList):
+ * dom/TagNodeList.h:
+ * html/LabelableElement.cpp:
+ (WebCore::LabelableElement::labels):
+ * html/LabelsNodeList.cpp:
+ (WebCore::LabelsNodeList::LabelsNodeList):
+ * html/LabelsNodeList.h:
+ * html/RadioNodeList.cpp:
+ (WebCore::RadioNodeList::RadioNodeList):
+ * html/RadioNodeList.h:
+
</ins><span class="cx"> 2014-03-27 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix crash when RenderView is cleared inside of frame flattening layout
</span></span></pre></div>
<a id="trunkSourceWebCoredomClassNodeListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ClassNodeList.cpp (166376 => 166377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ClassNodeList.cpp 2014-03-27 22:39:00 UTC (rev 166376)
+++ trunk/Source/WebCore/dom/ClassNodeList.cpp 2014-03-27 22:47:15 UTC (rev 166377)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> ClassNodeList::ClassNodeList(ContainerNode& rootNode, const String& classNames)
</span><del>- : CachedLiveNodeList(rootNode, Type::ClassNodeListType, InvalidateOnClassAttrChange)
</del><ins>+ : CachedLiveNodeList(rootNode, InvalidateOnClassAttrChange)
</ins><span class="cx"> , m_classNames(classNames, document().inQuirksMode())
</span><span class="cx"> , m_originalClassNames(classNames)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoredomContainerNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ContainerNode.cpp (166376 => 166377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ContainerNode.cpp 2014-03-27 22:39:00 UTC (rev 166376)
+++ trunk/Source/WebCore/dom/ContainerNode.cpp 2014-03-27 22:47:15 UTC (rev 166377)
</span><span class="lines">@@ -1018,8 +1018,8 @@
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> if (document().isHTMLDocument())
</span><del>- return ensureRareData().ensureNodeLists().addCacheWithAtomicName<HTMLTagNodeList>(*this, LiveNodeList::Type::HTMLTagNodeListType, localName);
- return ensureRareData().ensureNodeLists().addCacheWithAtomicName<TagNodeList>(*this, LiveNodeList::Type::TagNodeListType, localName);
</del><ins>+ return ensureRareData().ensureNodeLists().addCacheWithAtomicName<HTMLTagNodeList>(*this, localName);
+ return ensureRareData().ensureNodeLists().addCacheWithAtomicName<TagNodeList>(*this, localName);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<NodeList> ContainerNode::getElementsByTagNameNS(const AtomicString& namespaceURI, const AtomicString& localName)
</span><span class="lines">@@ -1035,18 +1035,18 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<NodeList> ContainerNode::getElementsByName(const String& elementName)
</span><span class="cx"> {
</span><del>- return ensureRareData().ensureNodeLists().addCacheWithAtomicName<NameNodeList>(*this, LiveNodeList::Type::NameNodeListType, elementName);
</del><ins>+ return ensureRareData().ensureNodeLists().addCacheWithAtomicName<NameNodeList>(*this, elementName);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<NodeList> ContainerNode::getElementsByClassName(const String& classNames)
</span><span class="cx"> {
</span><del>- return ensureRareData().ensureNodeLists().addCacheWithName<ClassNodeList>(*this, LiveNodeList::Type::ClassNodeListType, classNames);
</del><ins>+ return ensureRareData().ensureNodeLists().addCacheWithName<ClassNodeList>(*this, classNames);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<RadioNodeList> ContainerNode::radioNodeList(const AtomicString& name)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(hasTagName(HTMLNames::formTag) || hasTagName(HTMLNames::fieldsetTag));
</span><del>- return ensureRareData().ensureNodeLists().addCacheWithAtomicName<RadioNodeList>(*this, LiveNodeList::Type::RadioNodeListType, name);
</del><ins>+ return ensureRareData().ensureNodeLists().addCacheWithAtomicName<RadioNodeList>(*this, name);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoredomLiveNodeListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/LiveNodeList.cpp (166376 => 166377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/LiveNodeList.cpp 2014-03-27 22:39:00 UTC (rev 166376)
+++ trunk/Source/WebCore/dom/LiveNodeList.cpp 2014-03-27 22:47:15 UTC (rev 166377)
</span><span class="lines">@@ -31,15 +31,13 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-LiveNodeList::LiveNodeList(ContainerNode& ownerNode, Type type, NodeListInvalidationType invalidationType, NodeListRootType rootType)
</del><ins>+LiveNodeList::LiveNodeList(ContainerNode& ownerNode, NodeListInvalidationType invalidationType, NodeListRootType rootType)
</ins><span class="cx"> : m_ownerNode(ownerNode)
</span><span class="cx"> , m_rootType(rootType)
</span><span class="cx"> , m_invalidationType(invalidationType)
</span><del>- , m_type(static_cast<unsigned>(type))
</del><span class="cx"> {
</span><span class="cx"> ASSERT(m_rootType == static_cast<unsigned>(rootType));
</span><span class="cx"> ASSERT(m_invalidationType == static_cast<unsigned>(invalidationType));
</span><del>- ASSERT(m_type == static_cast<unsigned>(type));
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LiveNodeList::~LiveNodeList()
</span></span></pre></div>
<a id="trunkSourceWebCoredomLiveNodeListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/LiveNodeList.h (166376 => 166377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/LiveNodeList.h 2014-03-27 22:39:00 UTC (rev 166376)
+++ trunk/Source/WebCore/dom/LiveNodeList.h 2014-03-27 22:47:15 UTC (rev 166377)
</span><span class="lines">@@ -46,16 +46,7 @@
</span><span class="cx">
</span><span class="cx"> class LiveNodeList : public NodeList {
</span><span class="cx"> public:
</span><del>- enum class Type {
- ClassNodeListType,
- NameNodeListType,
- TagNodeListType,
- HTMLTagNodeListType,
- RadioNodeListType,
- LabelsNodeListType,
- };
-
- LiveNodeList(ContainerNode& ownerNode, Type, NodeListInvalidationType, NodeListRootType);
</del><ins>+ LiveNodeList(ContainerNode& ownerNode, NodeListInvalidationType, NodeListRootType);
</ins><span class="cx"> virtual Node* namedItem(const AtomicString&) const override final;
</span><span class="cx"> virtual bool nodeMatches(Element*) const = 0;
</span><span class="cx">
</span><span class="lines">@@ -63,7 +54,6 @@
</span><span class="cx">
</span><span class="cx"> ALWAYS_INLINE bool isRootedAtDocument() const { return m_rootType == NodeListIsRootedAtDocument; }
</span><span class="cx"> ALWAYS_INLINE NodeListInvalidationType invalidationType() const { return static_cast<NodeListInvalidationType>(m_invalidationType); }
</span><del>- ALWAYS_INLINE Type type() const { return static_cast<Type>(m_type); }
</del><span class="cx"> ContainerNode& ownerNode() const { return const_cast<ContainerNode&>(m_ownerNode.get()); }
</span><span class="cx"> ALWAYS_INLINE void invalidateCacheForAttribute(const QualifiedName* attrName) const
</span><span class="cx"> {
</span><span class="lines">@@ -87,7 +77,6 @@
</span><span class="cx">
</span><span class="cx"> const unsigned m_rootType : 1;
</span><span class="cx"> const unsigned m_invalidationType : 4;
</span><del>- const unsigned m_type : 3;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template <class NodeListType>
</span><span class="lines">@@ -110,7 +99,7 @@
</span><span class="cx"> virtual size_t memoryCost() const override;
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- CachedLiveNodeList(ContainerNode& rootNode, Type, NodeListInvalidationType, NodeListRootType = NodeListIsRootedAtNode);
</del><ins>+ CachedLiveNodeList(ContainerNode& rootNode, NodeListInvalidationType, NodeListRootType = NodeListIsRootedAtNode);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> mutable CollectionIndexCache<NodeListType, Element> m_indexCache;
</span><span class="lines">@@ -149,8 +138,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <class NodeListType>
</span><del>-CachedLiveNodeList<NodeListType>::CachedLiveNodeList(ContainerNode& ownerNode, Type type, NodeListInvalidationType invalidationType, NodeListRootType rootType)
- : LiveNodeList(ownerNode, type, invalidationType, rootType)
</del><ins>+CachedLiveNodeList<NodeListType>::CachedLiveNodeList(ContainerNode& ownerNode, NodeListInvalidationType invalidationType, NodeListRootType rootType)
+ : LiveNodeList(ownerNode, invalidationType, rootType)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomNameNodeListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/NameNodeList.cpp (166376 => 166377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/NameNodeList.cpp 2014-03-27 22:39:00 UTC (rev 166376)
+++ trunk/Source/WebCore/dom/NameNodeList.cpp 2014-03-27 22:47:15 UTC (rev 166377)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> using namespace HTMLNames;
</span><span class="cx">
</span><span class="cx"> NameNodeList::NameNodeList(ContainerNode& rootNode, const AtomicString& name)
</span><del>- : CachedLiveNodeList(rootNode, Type::NameNodeListType, InvalidateOnNameAttrChange)
</del><ins>+ : CachedLiveNodeList(rootNode, InvalidateOnNameAttrChange)
</ins><span class="cx"> , m_name(name)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -40,9 +40,4 @@
</span><span class="cx"> ownerNode().nodeLists()->removeCacheWithAtomicName(this, m_name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool NameNodeList::nodeMatches(Element* testNode) const
-{
- return testNode->getNameAttribute() == m_name;
-}
-
</del><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoredomNameNodeListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/NameNodeList.h (166376 => 166377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/NameNodeList.h 2014-03-27 22:39:00 UTC (rev 166376)
+++ trunk/Source/WebCore/dom/NameNodeList.h 2014-03-27 22:47:15 UTC (rev 166377)
</span><span class="lines">@@ -33,9 +33,8 @@
</span><span class="cx"> // NodeList which lists all Nodes in a Element with a given "name" attribute
</span><span class="cx"> class NameNodeList final : public CachedLiveNodeList<NameNodeList> {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<NameNodeList> create(ContainerNode& rootNode, Type type, const AtomicString& name)
</del><ins>+ static PassRefPtr<NameNodeList> create(ContainerNode& rootNode, const AtomicString& name)
</ins><span class="cx"> {
</span><del>- ASSERT_UNUSED(type, type == Type::NameNodeListType);
</del><span class="cx"> return adoptRef(new NameNodeList(rootNode, name));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -49,6 +48,11 @@
</span><span class="cx"> AtomicString m_name;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+inline bool NameNodeList::nodeMatches(Element* element) const
+{
+ return element->getNameAttribute() == m_name;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // NameNodeList_h
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodeRareDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/NodeRareData.h (166376 => 166377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/NodeRareData.h 2014-03-27 22:39:00 UTC (rev 166376)
+++ trunk/Source/WebCore/dom/NodeRareData.h 2014-03-27 22:47:15 UTC (rev 166377)
</span><span class="lines">@@ -49,6 +49,14 @@
</span><span class="cx"> class RadioNodeList;
</span><span class="cx"> class TreeScope;
</span><span class="cx">
</span><ins>+template <class ListType> struct NodeListTypeIdentifier;
+template <> struct NodeListTypeIdentifier<ClassNodeList> { static int value() { return 0; } };
+template <> struct NodeListTypeIdentifier<NameNodeList> { static int value() { return 1; } };
+template <> struct NodeListTypeIdentifier<TagNodeList> { static int value() { return 2; } };
+template <> struct NodeListTypeIdentifier<HTMLTagNodeList> { static int value() { return 3; } };
+template <> struct NodeListTypeIdentifier<RadioNodeList> { static int value() { return 4; } };
+template <> struct NodeListTypeIdentifier<LabelsNodeList> { static int value() { return 5; } };
+
</ins><span class="cx"> class NodeListsNodeData {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(NodeListsNodeData); WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="lines">@@ -110,21 +118,21 @@
</span><span class="cx"> typedef HashMap<QualifiedName, TagNodeList*> TagNodeListCacheNS;
</span><span class="cx">
</span><span class="cx"> template<typename T, typename ContainerType>
</span><del>- PassRefPtr<T> addCacheWithAtomicName(ContainerType& container, LiveNodeList::Type type, const AtomicString& name)
</del><ins>+ PassRefPtr<T> addCacheWithAtomicName(ContainerType& container, const AtomicString& name)
</ins><span class="cx"> {
</span><del>- NodeListAtomicNameCacheMap::AddResult result = m_atomicNameCaches.add(namedNodeListKey(type, name), nullptr);
</del><ins>+ NodeListAtomicNameCacheMap::AddResult result = m_atomicNameCaches.add(namedNodeListKey<T>(name), nullptr);
</ins><span class="cx"> if (!result.isNewEntry)
</span><span class="cx"> return static_cast<T*>(result.iterator->value);
</span><span class="cx">
</span><del>- RefPtr<T> list = T::create(container, type, name);
</del><ins>+ RefPtr<T> list = T::create(container, name);
</ins><span class="cx"> result.iterator->value = list.get();
</span><span class="cx"> return list.release();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T>
</span><del>- PassRefPtr<T> addCacheWithName(ContainerNode& node, LiveNodeList::Type type, const String& name)
</del><ins>+ PassRefPtr<T> addCacheWithName(ContainerNode& node, const String& name)
</ins><span class="cx"> {
</span><del>- NodeListNameCacheMap::AddResult result = m_nameCaches.add(namedNodeListKey(type, name), nullptr);
</del><ins>+ NodeListNameCacheMap::AddResult result = m_nameCaches.add(namedNodeListKey<T>(name), nullptr);
</ins><span class="cx"> if (!result.isNewEntry)
</span><span class="cx"> return static_cast<T*>(result.iterator->value);
</span><span class="cx">
</span><span class="lines">@@ -175,20 +183,22 @@
</span><span class="cx"> return static_cast<T*>(m_cachedCollections.get(namedCollectionKey(collectionType, starAtom)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void removeCacheWithAtomicName(LiveNodeList* list, const AtomicString& name = starAtom)
</del><ins>+ template <class NodeListType>
+ void removeCacheWithAtomicName(NodeListType* list, const AtomicString& name = starAtom)
</ins><span class="cx"> {
</span><del>- ASSERT(list == m_atomicNameCaches.get(namedNodeListKey(list->type(), name)));
</del><ins>+ ASSERT(list == m_atomicNameCaches.get(namedNodeListKey<NodeListType>(name)));
</ins><span class="cx"> if (deleteThisAndUpdateNodeRareDataIfAboutToRemoveLastList(list->ownerNode()))
</span><span class="cx"> return;
</span><del>- m_atomicNameCaches.remove(namedNodeListKey(list->type(), name));
</del><ins>+ m_atomicNameCaches.remove(namedNodeListKey<NodeListType>(name));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- void removeCacheWithName(LiveNodeList* list, const String& name)
</del><ins>+ template <class NodeListType>
+ void removeCacheWithName(NodeListType* list, const String& name)
</ins><span class="cx"> {
</span><del>- ASSERT(list == m_nameCaches.get(namedNodeListKey(list->type(), name)));
</del><ins>+ ASSERT(list == m_nameCaches.get(namedNodeListKey<NodeListType>(name)));
</ins><span class="cx"> if (deleteThisAndUpdateNodeRareDataIfAboutToRemoveLastList(list->ownerNode()))
</span><span class="cx"> return;
</span><del>- m_nameCaches.remove(namedNodeListKey(list->type(), name));
</del><ins>+ m_nameCaches.remove(namedNodeListKey<NodeListType>(name));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void removeCacheWithQualifiedName(LiveNodeList* list, const AtomicString& namespaceURI, const AtomicString& localName)
</span><span class="lines">@@ -259,9 +269,10 @@
</span><span class="cx"> return std::pair<unsigned char, AtomicString>(type, name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- std::pair<unsigned char, String> namedNodeListKey(LiveNodeList::Type type, const String& name)
</del><ins>+ template <class NodeListType>
+ std::pair<unsigned char, String> namedNodeListKey(const String& name)
</ins><span class="cx"> {
</span><del>- return std::pair<unsigned char, String>(static_cast<unsigned char>(type), name);
</del><ins>+ return std::pair<unsigned char, String>(NodeListTypeIdentifier<NodeListType>::value(), name);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool deleteThisAndUpdateNodeRareDataIfAboutToRemoveLastList(Node&);
</span></span></pre></div>
<a id="trunkSourceWebCoredomTagNodeListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/TagNodeList.cpp (166376 => 166377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/TagNodeList.cpp 2014-03-27 22:39:00 UTC (rev 166376)
+++ trunk/Source/WebCore/dom/TagNodeList.cpp 2014-03-27 22:47:15 UTC (rev 166377)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> TagNodeList::TagNodeList(ContainerNode& rootNode, const AtomicString& namespaceURI, const AtomicString& localName)
</span><del>- : CachedLiveNodeList(rootNode, Type::TagNodeListType, DoNotInvalidateOnAttributeChanges)
</del><ins>+ : CachedLiveNodeList(rootNode, DoNotInvalidateOnAttributeChanges)
</ins><span class="cx"> , m_namespaceURI(namespaceURI)
</span><span class="cx"> , m_localName(localName)
</span><span class="cx"> {
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HTMLTagNodeList::HTMLTagNodeList(ContainerNode& rootNode, const AtomicString& localName)
</span><del>- : CachedLiveNodeList(rootNode, Type::HTMLTagNodeListType, DoNotInvalidateOnAttributeChanges)
</del><ins>+ : CachedLiveNodeList(rootNode, DoNotInvalidateOnAttributeChanges)
</ins><span class="cx"> , m_localName(localName)
</span><span class="cx"> , m_loweredLocalName(localName.lower())
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoredomTagNodeListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/TagNodeList.h (166376 => 166377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/TagNodeList.h 2014-03-27 22:39:00 UTC (rev 166376)
+++ trunk/Source/WebCore/dom/TagNodeList.h 2014-03-27 22:47:15 UTC (rev 166377)
</span><span class="lines">@@ -39,9 +39,8 @@
</span><span class="cx"> return adoptRef(new TagNodeList(rootNode, namespaceURI, localName));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static PassRefPtr<TagNodeList> create(ContainerNode& rootNode, Type type, const AtomicString& localName)
</del><ins>+ static PassRefPtr<TagNodeList> create(ContainerNode& rootNode, const AtomicString& localName)
</ins><span class="cx"> {
</span><del>- ASSERT_UNUSED(type, type == Type::TagNodeListType);
</del><span class="cx"> return adoptRef(new TagNodeList(rootNode, starAtom, localName));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -67,9 +66,8 @@
</span><span class="cx">
</span><span class="cx"> class HTMLTagNodeList final : public CachedLiveNodeList<HTMLTagNodeList> {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<HTMLTagNodeList> create(ContainerNode& rootNode, Type type, const AtomicString& localName)
</del><ins>+ static PassRefPtr<HTMLTagNodeList> create(ContainerNode& rootNode, const AtomicString& localName)
</ins><span class="cx"> {
</span><del>- ASSERT_UNUSED(type, type == Type::HTMLTagNodeListType);
</del><span class="cx"> return adoptRef(new HTMLTagNodeList(rootNode, localName));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlLabelableElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/LabelableElement.cpp (166376 => 166377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/LabelableElement.cpp 2014-03-27 22:39:00 UTC (rev 166376)
+++ trunk/Source/WebCore/html/LabelableElement.cpp 2014-03-27 22:47:15 UTC (rev 166377)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> if (!supportLabels())
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- return ensureRareData().ensureNodeLists().addCacheWithAtomicName<LabelsNodeList>(*this, LiveNodeList::Type::LabelsNodeListType, starAtom);
</del><ins>+ return ensureRareData().ensureNodeLists().addCacheWithAtomicName<LabelsNodeList>(*this, starAtom);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace Webcore
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlLabelsNodeListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/LabelsNodeList.cpp (166376 => 166377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/LabelsNodeList.cpp 2014-03-27 22:39:00 UTC (rev 166376)
+++ trunk/Source/WebCore/html/LabelsNodeList.cpp 2014-03-27 22:47:15 UTC (rev 166377)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> using namespace HTMLNames;
</span><span class="cx">
</span><span class="cx"> LabelsNodeList::LabelsNodeList(LabelableElement& forNode)
</span><del>- : CachedLiveNodeList(forNode, Type::LabelsNodeListType, InvalidateOnForAttrChange, NodeListIsRootedAtDocument)
</del><ins>+ : CachedLiveNodeList(forNode, InvalidateOnForAttrChange, NodeListIsRootedAtDocument)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlLabelsNodeListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/LabelsNodeList.h (166376 => 166377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/LabelsNodeList.h 2014-03-27 22:39:00 UTC (rev 166376)
+++ trunk/Source/WebCore/html/LabelsNodeList.h 2014-03-27 22:47:15 UTC (rev 166377)
</span><span class="lines">@@ -32,9 +32,8 @@
</span><span class="cx">
</span><span class="cx"> class LabelsNodeList final : public CachedLiveNodeList<LabelsNodeList> {
</span><span class="cx"> public:
</span><del>- static PassRef<LabelsNodeList> create(LabelableElement& forNode, Type type, const AtomicString&)
</del><ins>+ static PassRef<LabelsNodeList> create(LabelableElement& forNode, const AtomicString&)
</ins><span class="cx"> {
</span><del>- ASSERT_UNUSED(type, type == Type::LabelsNodeListType);
</del><span class="cx"> return adoptRef(*new LabelsNodeList(forNode));
</span><span class="cx"> }
</span><span class="cx"> ~LabelsNodeList();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlRadioNodeListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/RadioNodeList.cpp (166376 => 166377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/RadioNodeList.cpp 2014-03-27 22:39:00 UTC (rev 166376)
+++ trunk/Source/WebCore/html/RadioNodeList.cpp 2014-03-27 22:47:15 UTC (rev 166377)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> using namespace HTMLNames;
</span><span class="cx">
</span><span class="cx"> RadioNodeList::RadioNodeList(ContainerNode& rootNode, const AtomicString& name)
</span><del>- : CachedLiveNodeList(rootNode, Type::RadioNodeListType, InvalidateForFormControls, isHTMLFormElement(rootNode) ? NodeListIsRootedAtDocument : NodeListIsRootedAtNode)
</del><ins>+ : CachedLiveNodeList(rootNode, InvalidateForFormControls, isHTMLFormElement(rootNode) ? NodeListIsRootedAtDocument : NodeListIsRootedAtNode)
</ins><span class="cx"> , m_name(name)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlRadioNodeListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/RadioNodeList.h (166376 => 166377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/RadioNodeList.h 2014-03-27 22:39:00 UTC (rev 166376)
+++ trunk/Source/WebCore/html/RadioNodeList.h 2014-03-27 22:47:15 UTC (rev 166377)
</span><span class="lines">@@ -34,9 +34,8 @@
</span><span class="cx">
</span><span class="cx"> class RadioNodeList final : public CachedLiveNodeList<RadioNodeList> {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<RadioNodeList> create(ContainerNode& rootNode, Type type, const AtomicString& name)
</del><ins>+ static PassRefPtr<RadioNodeList> create(ContainerNode& rootNode, const AtomicString& name)
</ins><span class="cx"> {
</span><del>- ASSERT_UNUSED(type, type == Type::RadioNodeListType);
</del><span class="cx"> return adoptRef(new RadioNodeList(rootNode, name));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>