<!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>[166369] 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/166369">166369</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2014-03-27 13:49:27 -0700 (Thu, 27 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove some unnecessary branches from LiveNodeList traversal
https://bugs.webkit.org/show_bug.cgi?id=130854
Reviewed by Andreas Kling.
Compile different traversal code paths for all NodeList subclasses.
* dom/ClassNodeList.cpp:
(WebCore::ClassNodeList::ClassNodeList):
(WebCore::ClassNodeList::~ClassNodeList):
(WebCore::ClassNodeList::nodeMatches): Deleted.
* dom/ClassNodeList.h:
(WebCore::ClassNodeList::nodeMatches):
(WebCore::ClassNodeList::nodeMatchesInlined): Deleted.
Remove separate nodeMatchesInlined functions.
We now rely on exact types and marking classes final.
* dom/LiveNodeList.cpp:
(WebCore::LiveNodeList::LiveNodeList):
(WebCore::LiveNodeList::~LiveNodeList):
(WebCore::LiveNodeList::namedItem):
(WebCore::LiveNodeList::rootNode): Deleted.
(WebCore::isMatchingElement): Deleted.
(WebCore::firstMatchingElement): Deleted.
(WebCore::lastMatchingElement): Deleted.
(WebCore::nextMatchingElement): Deleted.
(WebCore::previousMatchingElement): Deleted.
(WebCore::traverseMatchingElementsForward): Deleted.
(WebCore::traverseMatchingElementsBackward): Deleted.
(WebCore::LiveNodeList::collectionFirst): Deleted.
(WebCore::LiveNodeList::collectionLast): Deleted.
(WebCore::LiveNodeList::collectionTraverseForward): Deleted.
(WebCore::LiveNodeList::collectionTraverseBackward): Deleted.
(WebCore::LiveNodeList::length): Deleted.
(WebCore::LiveNodeList::item): Deleted.
(WebCore::LiveNodeList::memoryCost): Deleted.
(WebCore::LiveNodeList::invalidateCache): Deleted.
* dom/LiveNodeList.h:
(WebCore::LiveNodeList::invalidateCacheForAttribute):
(WebCore::CachedLiveNodeList::collectionCanTraverseBackward):
(WebCore::LiveNodeList::rootNode):
(WebCore::CachedLiveNodeList<NodeListType>::CachedLiveNodeList):
Add CachedLiveNodeList<NodeListType> utility type that interfaces with CollectionIndexCache.
It is the base class for all concrete LiveNodeLists.
(WebCore::CachedLiveNodeList<NodeListType>::~CachedLiveNodeList):
(WebCore::CachedLiveNodeList<NodeListType>::collectionFirst):
(WebCore::CachedLiveNodeList<NodeListType>::collectionLast):
(WebCore::nextMatchingElement):
(WebCore::CachedLiveNodeList<NodeListType>::collectionTraverseForward):
(WebCore::previousMatchingElement):
(WebCore::CachedLiveNodeList<NodeListType>::collectionTraverseBackward):
(WebCore::CachedLiveNodeList<NodeListType>::willValidateIndexCache):
(WebCore::CachedLiveNodeList<NodeListType>::invalidateCache):
(WebCore::CachedLiveNodeList<NodeListType>::length):
(WebCore::CachedLiveNodeList<NodeListType>::item):
(WebCore::CachedLiveNodeList<NodeListType>::memoryCost):
Templated code moves to header.
(WebCore::LiveNodeList::LiveNodeList): Deleted.
(WebCore::LiveNodeList::~LiveNodeList): Deleted.
(WebCore::LiveNodeList::invalidateCache): Deleted.
(WebCore::LiveNodeList::collectionCanTraverseBackward): Deleted.
(WebCore::LiveNodeList::willValidateIndexCache): Deleted.
* dom/NameNodeList.cpp:
(WebCore::NameNodeList::NameNodeList):
* dom/NameNodeList.h:
* dom/Node.cpp:
(WebCore::Document::invalidateNodeListAndCollectionCaches):
(WebCore::NodeListsNodeData::invalidateCaches):
* dom/TagNodeList.cpp:
(WebCore::TagNodeList::TagNodeList):
(WebCore::HTMLTagNodeList::HTMLTagNodeList):
(WebCore::HTMLTagNodeList::~HTMLTagNodeList):
(WebCore::TagNodeList::nodeMatches): Deleted.
(WebCore::HTMLTagNodeList::nodeMatches): Deleted.
* dom/TagNodeList.h:
(WebCore::TagNodeList::nodeMatches):
(WebCore::HTMLTagNodeList::nodeMatches):
(WebCore::TagNodeList::create): Deleted.
(WebCore::HTMLTagNodeList::nodeMatchesInlined): Deleted.
* 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="#trunkSourceWebCoredomClassNodeListh">trunk/Source/WebCore/dom/ClassNodeList.h</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="#trunkSourceWebCoredomNodecpp">trunk/Source/WebCore/dom/Node.cpp</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="#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 (166368 => 166369)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-27 20:07:36 UTC (rev 166368)
+++ trunk/Source/WebCore/ChangeLog 2014-03-27 20:49:27 UTC (rev 166369)
</span><span class="lines">@@ -1,3 +1,96 @@
</span><ins>+2014-03-27 Antti Koivisto <antti@apple.com>
+
+ Remove some unnecessary branches from LiveNodeList traversal
+ https://bugs.webkit.org/show_bug.cgi?id=130854
+
+ Reviewed by Andreas Kling.
+
+ Compile different traversal code paths for all NodeList subclasses.
+
+ * dom/ClassNodeList.cpp:
+ (WebCore::ClassNodeList::ClassNodeList):
+ (WebCore::ClassNodeList::~ClassNodeList):
+ (WebCore::ClassNodeList::nodeMatches): Deleted.
+ * dom/ClassNodeList.h:
+ (WebCore::ClassNodeList::nodeMatches):
+ (WebCore::ClassNodeList::nodeMatchesInlined): Deleted.
+
+ Remove separate nodeMatchesInlined functions.
+ We now rely on exact types and marking classes final.
+
+ * dom/LiveNodeList.cpp:
+ (WebCore::LiveNodeList::LiveNodeList):
+ (WebCore::LiveNodeList::~LiveNodeList):
+ (WebCore::LiveNodeList::namedItem):
+ (WebCore::LiveNodeList::rootNode): Deleted.
+ (WebCore::isMatchingElement): Deleted.
+ (WebCore::firstMatchingElement): Deleted.
+ (WebCore::lastMatchingElement): Deleted.
+ (WebCore::nextMatchingElement): Deleted.
+ (WebCore::previousMatchingElement): Deleted.
+ (WebCore::traverseMatchingElementsForward): Deleted.
+ (WebCore::traverseMatchingElementsBackward): Deleted.
+ (WebCore::LiveNodeList::collectionFirst): Deleted.
+ (WebCore::LiveNodeList::collectionLast): Deleted.
+ (WebCore::LiveNodeList::collectionTraverseForward): Deleted.
+ (WebCore::LiveNodeList::collectionTraverseBackward): Deleted.
+ (WebCore::LiveNodeList::length): Deleted.
+ (WebCore::LiveNodeList::item): Deleted.
+ (WebCore::LiveNodeList::memoryCost): Deleted.
+ (WebCore::LiveNodeList::invalidateCache): Deleted.
+ * dom/LiveNodeList.h:
+ (WebCore::LiveNodeList::invalidateCacheForAttribute):
+ (WebCore::CachedLiveNodeList::collectionCanTraverseBackward):
+ (WebCore::LiveNodeList::rootNode):
+ (WebCore::CachedLiveNodeList<NodeListType>::CachedLiveNodeList):
+
+ Add CachedLiveNodeList<NodeListType> utility type that interfaces with CollectionIndexCache.
+ It is the base class for all concrete LiveNodeLists.
+
+ (WebCore::CachedLiveNodeList<NodeListType>::~CachedLiveNodeList):
+ (WebCore::CachedLiveNodeList<NodeListType>::collectionFirst):
+ (WebCore::CachedLiveNodeList<NodeListType>::collectionLast):
+ (WebCore::nextMatchingElement):
+ (WebCore::CachedLiveNodeList<NodeListType>::collectionTraverseForward):
+ (WebCore::previousMatchingElement):
+ (WebCore::CachedLiveNodeList<NodeListType>::collectionTraverseBackward):
+ (WebCore::CachedLiveNodeList<NodeListType>::willValidateIndexCache):
+ (WebCore::CachedLiveNodeList<NodeListType>::invalidateCache):
+ (WebCore::CachedLiveNodeList<NodeListType>::length):
+ (WebCore::CachedLiveNodeList<NodeListType>::item):
+ (WebCore::CachedLiveNodeList<NodeListType>::memoryCost):
+
+ Templated code moves to header.
+
+ (WebCore::LiveNodeList::LiveNodeList): Deleted.
+ (WebCore::LiveNodeList::~LiveNodeList): Deleted.
+ (WebCore::LiveNodeList::invalidateCache): Deleted.
+ (WebCore::LiveNodeList::collectionCanTraverseBackward): Deleted.
+ (WebCore::LiveNodeList::willValidateIndexCache): Deleted.
+ * dom/NameNodeList.cpp:
+ (WebCore::NameNodeList::NameNodeList):
+ * dom/NameNodeList.h:
+ * dom/Node.cpp:
+ (WebCore::Document::invalidateNodeListAndCollectionCaches):
+ (WebCore::NodeListsNodeData::invalidateCaches):
+ * dom/TagNodeList.cpp:
+ (WebCore::TagNodeList::TagNodeList):
+ (WebCore::HTMLTagNodeList::HTMLTagNodeList):
+ (WebCore::HTMLTagNodeList::~HTMLTagNodeList):
+ (WebCore::TagNodeList::nodeMatches): Deleted.
+ (WebCore::HTMLTagNodeList::nodeMatches): Deleted.
+ * dom/TagNodeList.h:
+ (WebCore::TagNodeList::nodeMatches):
+ (WebCore::HTMLTagNodeList::nodeMatches):
+ (WebCore::TagNodeList::create): Deleted.
+ (WebCore::HTMLTagNodeList::nodeMatchesInlined): Deleted.
+ * 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 Adenilson Cavalcanti <cavalcantii@gmail.com>
</span><span class="cx">
</span><span class="cx"> Remove comment from Filter.h
</span></span></pre></div>
<a id="trunkSourceWebCoredomClassNodeListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ClassNodeList.cpp (166368 => 166369)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ClassNodeList.cpp 2014-03-27 20:07:36 UTC (rev 166368)
+++ trunk/Source/WebCore/dom/ClassNodeList.cpp 2014-03-27 20:49:27 UTC (rev 166369)
</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>- : LiveNodeList(rootNode, Type::ClassNodeListType, InvalidateOnClassAttrChange)
</del><ins>+ : CachedLiveNodeList(rootNode, Type::ClassNodeListType, InvalidateOnClassAttrChange)
</ins><span class="cx"> , m_classNames(classNames, document().inQuirksMode())
</span><span class="cx"> , m_originalClassNames(classNames)
</span><span class="cx"> {
</span><span class="lines">@@ -45,11 +45,6 @@
</span><span class="cx"> ClassNodeList::~ClassNodeList()
</span><span class="cx"> {
</span><span class="cx"> ownerNode().nodeLists()->removeCacheWithName(this, m_originalClassNames);
</span><del>-}
-
-bool ClassNodeList::nodeMatches(Element* testNode) const
-{
- return nodeMatchesInlined(testNode);
</del><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 (166368 => 166369)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ClassNodeList.h 2014-03-27 20:07:36 UTC (rev 166368)
+++ trunk/Source/WebCore/dom/ClassNodeList.h 2014-03-27 20:49:27 UTC (rev 166369)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class ClassNodeList : public LiveNodeList {
</del><ins>+class ClassNodeList final : public CachedLiveNodeList<ClassNodeList> {
</ins><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<ClassNodeList> create(ContainerNode& rootNode, const String& classNames)
</span><span class="cx"> {
</span><span class="lines">@@ -46,28 +46,26 @@
</span><span class="cx">
</span><span class="cx"> virtual ~ClassNodeList();
</span><span class="cx">
</span><del>- bool nodeMatchesInlined(Element*) const;
</del><ins>+ virtual bool nodeMatches(Element*) const override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> ClassNodeList(ContainerNode& rootNode, const String& classNames);
</span><span class="cx">
</span><del>- virtual bool nodeMatches(Element*) const override;
-
</del><span class="cx"> SpaceSplitString m_classNames;
</span><span class="cx"> String m_originalClassNames;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-inline bool ClassNodeList::nodeMatchesInlined(Element* testNode) const
</del><ins>+inline bool ClassNodeList::nodeMatches(Element* element) const
</ins><span class="cx"> {
</span><del>- if (!testNode->hasClass())
</del><ins>+ if (!element->hasClass())
</ins><span class="cx"> return false;
</span><span class="cx"> if (!m_classNames.size())
</span><span class="cx"> return false;
</span><span class="cx"> // FIXME: DOM4 allows getElementsByClassName to return non StyledElement.
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=94718
</span><del>- if (!testNode->isStyledElement())
</del><ins>+ if (!element->isStyledElement())
</ins><span class="cx"> return false;
</span><del>- return testNode->classNames().containsAll(m_classNames);
</del><ins>+ return element->classNames().containsAll(m_classNames);
</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 (166368 => 166369)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/LiveNodeList.cpp 2014-03-27 20:07:36 UTC (rev 166368)
+++ trunk/Source/WebCore/dom/LiveNodeList.cpp 2014-03-27 20:49:27 UTC (rev 166369)
</span><span class="lines">@@ -31,155 +31,22 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-ContainerNode& LiveNodeList::rootNode() const
</del><ins>+LiveNodeList::LiveNodeList(ContainerNode& ownerNode, Type type, NodeListInvalidationType invalidationType, NodeListRootType rootType)
+ : m_ownerNode(ownerNode)
+ , m_rootType(rootType)
+ , m_invalidationType(invalidationType)
+ , m_type(static_cast<unsigned>(type))
</ins><span class="cx"> {
</span><del>- if (isRootedAtDocument() && ownerNode().inDocument())
- return ownerNode().document();
-
- return ownerNode();
</del><ins>+ ASSERT(m_rootType == static_cast<unsigned>(rootType));
+ ASSERT(m_invalidationType == static_cast<unsigned>(invalidationType));
+ ASSERT(m_type == static_cast<unsigned>(type));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-template <class NodeListType>
-inline bool isMatchingElement(const NodeListType*, Element*);
-
-template <> inline bool isMatchingElement(const LiveNodeList* nodeList, Element* element)
</del><ins>+LiveNodeList::~LiveNodeList()
</ins><span class="cx"> {
</span><del>- return nodeList->nodeMatches(element);
</del><span class="cx"> }
</span><span class="cx">
</span><del>-template <> inline bool isMatchingElement(const HTMLTagNodeList* nodeList, Element* element)
-{
- return nodeList->nodeMatchesInlined(element);
-}
</del><span class="cx">
</span><del>-template <> inline bool isMatchingElement(const ClassNodeList* nodeList, Element* element)
-{
- return nodeList->nodeMatchesInlined(element);
-}
-
-template <class NodeListType>
-inline Element* firstMatchingElement(const NodeListType* nodeList, ContainerNode& root)
-{
- Element* element = ElementTraversal::firstWithin(&root);
- while (element && !isMatchingElement(nodeList, element))
- element = ElementTraversal::next(element, &root);
- return element;
-}
-
-template <class NodeListType>
-inline Element* lastMatchingElement(const NodeListType* nodeList, ContainerNode& root)
-{
- Element* element = ElementTraversal::lastWithin(&root);
- while (element && !isMatchingElement(nodeList, element))
- element = ElementTraversal::previous(element, &root);
- return element;
-}
-
-template <class NodeListType>
-inline Element* nextMatchingElement(const NodeListType* nodeList, Element* current, ContainerNode& root)
-{
- do {
- current = ElementTraversal::next(current, &root);
- } while (current && !isMatchingElement(nodeList, current));
- return current;
-}
-
-template <class NodeListType>
-inline Element* previousMatchingElement(const NodeListType* nodeList, Element* current, ContainerNode& root)
-{
- do {
- current = ElementTraversal::previous(current, &root);
- } while (current && !isMatchingElement(nodeList, current));
- return current;
-}
-
-template <class NodeListType>
-inline Element* traverseMatchingElementsForward(const NodeListType* nodeList, Element& current, unsigned count, unsigned& traversedCount, ContainerNode& root)
-{
- Element* element = &current;
- for (traversedCount = 0; traversedCount < count; ++traversedCount) {
- element = nextMatchingElement(nodeList, element, root);
- if (!element)
- return nullptr;
- }
- return element;
-}
-
-template <class NodeListType>
-inline Element* traverseMatchingElementsBackward(const NodeListType* nodeList, Element& current, unsigned count, ContainerNode& root)
-{
- Element* element = &current;
- for (; count; --count) {
- element = previousMatchingElement(nodeList, element, root);
- if (!element)
- return nullptr;
- }
- return element;
-}
-
-Element* LiveNodeList::collectionFirst() const
-{
- auto& root = rootNode();
- if (type() == Type::HTMLTagNodeListType)
- return firstMatchingElement(static_cast<const HTMLTagNodeList*>(this), root);
- if (type() == Type::ClassNodeListType)
- return firstMatchingElement(static_cast<const ClassNodeList*>(this), root);
- return firstMatchingElement(static_cast<const LiveNodeList*>(this), root);
-}
-
-Element* LiveNodeList::collectionLast() const
-{
- auto& root = rootNode();
- if (type() == Type::HTMLTagNodeListType)
- return lastMatchingElement(static_cast<const HTMLTagNodeList*>(this), root);
- if (type() == Type::ClassNodeListType)
- return lastMatchingElement(static_cast<const ClassNodeList*>(this), root);
- return lastMatchingElement(static_cast<const LiveNodeList*>(this), root);
-}
-
-Element* LiveNodeList::collectionTraverseForward(Element& current, unsigned count, unsigned& traversedCount) const
-{
- auto& root = rootNode();
- if (type() == Type::HTMLTagNodeListType)
- return traverseMatchingElementsForward(static_cast<const HTMLTagNodeList*>(this), current, count, traversedCount, root);
- if (type() == Type::ClassNodeListType)
- return traverseMatchingElementsForward(static_cast<const ClassNodeList*>(this), current, count, traversedCount, root);
- return traverseMatchingElementsForward(static_cast<const LiveNodeList*>(this), current, count, traversedCount, root);
-}
-
-Element* LiveNodeList::collectionTraverseBackward(Element& current, unsigned count) const
-{
- auto& root = rootNode();
- if (type() == Type::HTMLTagNodeListType)
- return traverseMatchingElementsBackward(static_cast<const HTMLTagNodeList*>(this), current, count, root);
- if (type() == Type::ClassNodeListType)
- return traverseMatchingElementsBackward(static_cast<const ClassNodeList*>(this), current, count, root);
- return traverseMatchingElementsBackward(static_cast<const LiveNodeList*>(this), current, count, root);
-}
-
-unsigned LiveNodeList::length() const
-{
- return m_indexCache.nodeCount(*this);
-}
-
-Node* LiveNodeList::item(unsigned offset) const
-{
- return m_indexCache.nodeAt(*this, offset);
-}
-
-size_t LiveNodeList::memoryCost() const
-{
- return m_indexCache.memoryCost();
-}
-
-void LiveNodeList::invalidateCache(Document& document) const
-{
- if (!m_indexCache.hasValidCache())
- return;
- document.unregisterNodeList(const_cast<LiveNodeList&>(*this));
- m_indexCache.invalidate();
-}
-
</del><span class="cx"> Node* LiveNodeList::namedItem(const AtomicString& elementId) const
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Why doesn't this look into the name attribute like HTMLCollection::namedItem does?
</span><span class="lines">@@ -190,7 +57,7 @@
</span><span class="cx"> if (element && nodeMatches(element) && element->isDescendantOf(&rootNode))
</span><span class="cx"> return element;
</span><span class="cx"> if (!element)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> // In the case of multiple nodes with the same name, just fall through.
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -205,7 +72,7 @@
</span><span class="cx"> return node;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoredomLiveNodeListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/LiveNodeList.h (166368 => 166369)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/LiveNodeList.h 2014-03-27 20:07:36 UTC (rev 166368)
+++ trunk/Source/WebCore/dom/LiveNodeList.h 2014-03-27 20:49:27 UTC (rev 166369)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include "CollectionIndexCache.h"
</span><span class="cx"> #include "CollectionType.h"
</span><span class="cx"> #include "Document.h"
</span><ins>+#include "ElementTraversal.h"
</ins><span class="cx"> #include "HTMLNames.h"
</span><span class="cx"> #include "NodeList.h"
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="lines">@@ -54,49 +55,23 @@
</span><span class="cx"> LabelsNodeListType,
</span><span class="cx"> };
</span><span class="cx">
</span><del>- LiveNodeList(ContainerNode& ownerNode, Type type, NodeListInvalidationType invalidationType, NodeListRootType rootType = NodeListIsRootedAtNode)
- : m_ownerNode(ownerNode)
- , m_rootType(rootType)
- , m_invalidationType(invalidationType)
- , m_type(static_cast<unsigned>(type))
- {
- ASSERT(m_rootType == static_cast<unsigned>(rootType));
- ASSERT(m_invalidationType == static_cast<unsigned>(invalidationType));
- ASSERT(m_type == static_cast<unsigned>(type));
- }
</del><ins>+ LiveNodeList(ContainerNode& ownerNode, Type, 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><del>- virtual ~LiveNodeList()
- {
- if (m_indexCache.hasValidCache())
- document().unregisterNodeList(*this);
- }
</del><ins>+ virtual ~LiveNodeList();
</ins><span class="cx">
</span><del>- // DOM API
- virtual unsigned length() const override final;
- virtual Node* item(unsigned offset) const override final;
- virtual size_t memoryCost() const override;
-
</del><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><span class="cx"> ALWAYS_INLINE Type type() const { return static_cast<Type>(m_type); }
</span><span class="cx"> ContainerNode& ownerNode() const { return const_cast<ContainerNode&>(m_ownerNode.get()); }
</span><del>- ALWAYS_INLINE void invalidateCache(const QualifiedName* attrName) const
</del><ins>+ ALWAYS_INLINE void invalidateCacheForAttribute(const QualifiedName* attrName) const
</ins><span class="cx"> {
</span><span class="cx"> if (!attrName || shouldInvalidateTypeOnAttributeChange(invalidationType(), *attrName))
</span><span class="cx"> invalidateCache(document());
</span><span class="cx"> }
</span><del>- void invalidateCache(Document&) const;
</del><ins>+ virtual void invalidateCache(Document&) const = 0;
</ins><span class="cx">
</span><del>- // For CollectionIndexCache
- Element* collectionFirst() const;
- Element* collectionLast() const;
- Element* collectionTraverseForward(Element&, unsigned count, unsigned& traversedCount) const;
- Element* collectionTraverseBackward(Element&, unsigned count) const;
- bool collectionCanTraverseBackward() const { return true; }
- void willValidateIndexCache() const { document().registerNodeList(const_cast<LiveNodeList&>(*this)); }
-
</del><span class="cx"> protected:
</span><span class="cx"> Document& document() const { return m_ownerNode->document(); }
</span><span class="cx"> ContainerNode& rootNode() const;
</span><span class="lines">@@ -110,13 +85,37 @@
</span><span class="cx">
</span><span class="cx"> Ref<ContainerNode> m_ownerNode;
</span><span class="cx">
</span><del>- mutable CollectionIndexCache<LiveNodeList, Element> m_indexCache;
-
</del><span class="cx"> const unsigned m_rootType : 1;
</span><span class="cx"> const unsigned m_invalidationType : 4;
</span><span class="cx"> const unsigned m_type : 3;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+template <class NodeListType>
+class CachedLiveNodeList : public LiveNodeList {
+public:
+ virtual ~CachedLiveNodeList();
+
+ virtual unsigned length() const override final;
+ virtual Node* item(unsigned offset) const override final;
+
+ // For CollectionIndexCache
+ Element* collectionFirst() const;
+ Element* collectionLast() const;
+ Element* collectionTraverseForward(Element&, unsigned count, unsigned& traversedCount) const;
+ Element* collectionTraverseBackward(Element&, unsigned count) const;
+ bool collectionCanTraverseBackward() const { return true; }
+ void willValidateIndexCache() const;
+
+ virtual void invalidateCache(Document&) const;
+ virtual size_t memoryCost() const override;
+
+protected:
+ CachedLiveNodeList(ContainerNode& rootNode, Type, NodeListInvalidationType, NodeListRootType = NodeListIsRootedAtNode);
+
+private:
+ mutable CollectionIndexCache<NodeListType, Element> m_indexCache;
+};
+
</ins><span class="cx"> ALWAYS_INLINE bool shouldInvalidateTypeOnAttributeChange(NodeListInvalidationType type, const QualifiedName& attrName)
</span><span class="cx"> {
</span><span class="cx"> switch (type) {
</span><span class="lines">@@ -141,6 +140,123 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline ContainerNode& LiveNodeList::rootNode() const
+{
+ if (isRootedAtDocument() && ownerNode().inDocument())
+ return ownerNode().document();
+
+ return ownerNode();
+}
+
+template <class NodeListType>
+CachedLiveNodeList<NodeListType>::CachedLiveNodeList(ContainerNode& ownerNode, Type type, NodeListInvalidationType invalidationType, NodeListRootType rootType)
+ : LiveNodeList(ownerNode, type, invalidationType, rootType)
+{
+}
+
+template <class NodeListType>
+CachedLiveNodeList<NodeListType>::~CachedLiveNodeList()
+{
+ if (m_indexCache.hasValidCache())
+ document().unregisterNodeList(*this);
+}
+
+template <class NodeListType>
+Element* CachedLiveNodeList<NodeListType>::collectionFirst() const
+{
+ auto& root = rootNode();
+ Element* element = ElementTraversal::firstWithin(&root);
+ while (element && !static_cast<const NodeListType*>(this)->nodeMatches(element))
+ element = ElementTraversal::next(element, &root);
+ return element;
+}
+
+template <class NodeListType>
+Element* CachedLiveNodeList<NodeListType>::collectionLast() const
+{
+ auto& root = rootNode();
+ Element* element = ElementTraversal::lastWithin(&root);
+ while (element && !static_cast<const NodeListType*>(this)->nodeMatches(element))
+ element = ElementTraversal::previous(element, &root);
+ return element;
+}
+
+template <class NodeListType>
+inline Element* nextMatchingElement(const NodeListType* nodeList, Element* current, ContainerNode& root)
+{
+ do {
+ current = ElementTraversal::next(current, &root);
+ } while (current && !static_cast<const NodeListType*>(nodeList)->nodeMatches(current));
+ return current;
+}
+
+template <class NodeListType>
+Element* CachedLiveNodeList<NodeListType>::collectionTraverseForward(Element& current, unsigned count, unsigned& traversedCount) const
+{
+ auto& root = rootNode();
+ Element* element = &current;
+ for (traversedCount = 0; traversedCount < count; ++traversedCount) {
+ element = nextMatchingElement(static_cast<const NodeListType*>(this), element, root);
+ if (!element)
+ return nullptr;
+ }
+ return element;
+}
+
+template <class NodeListType>
+inline Element* previousMatchingElement(const NodeListType* nodeList, Element* current, ContainerNode& root)
+{
+ do {
+ current = ElementTraversal::previous(current, &root);
+ } while (current && !nodeList->nodeMatches(current));
+ return current;
+}
+
+template <class NodeListType>
+Element* CachedLiveNodeList<NodeListType>::collectionTraverseBackward(Element& current, unsigned count) const
+{
+ auto& root = rootNode();
+ Element* element = &current;
+ for (; count; --count) {
+ element = previousMatchingElement(static_cast<const NodeListType*>(this), element, root);
+ if (!element)
+ return nullptr;
+ }
+ return element;
+}
+template <class NodeListType>
+void CachedLiveNodeList<NodeListType>::willValidateIndexCache() const
+{
+ document().registerNodeList(const_cast<NodeListType&>(static_cast<const NodeListType&>(*this)));
+}
+
+template <class NodeListType>
+void CachedLiveNodeList<NodeListType>::invalidateCache(Document& document) const
+{
+ if (!m_indexCache.hasValidCache())
+ return;
+ document.unregisterNodeList(const_cast<NodeListType&>(static_cast<const NodeListType&>(*this)));
+ m_indexCache.invalidate();
+}
+
+template <class NodeListType>
+unsigned CachedLiveNodeList<NodeListType>::length() const
+{
+ return m_indexCache.nodeCount(static_cast<const NodeListType&>(*this));
+}
+
+template <class NodeListType>
+Node* CachedLiveNodeList<NodeListType>::item(unsigned offset) const
+{
+ return m_indexCache.nodeAt(static_cast<const NodeListType&>(*this), offset);
+}
+
+template <class NodeListType>
+size_t CachedLiveNodeList<NodeListType>::memoryCost() const
+{
+ return m_indexCache.memoryCost();
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // LiveNodeList_h
</span></span></pre></div>
<a id="trunkSourceWebCoredomNameNodeListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/NameNodeList.cpp (166368 => 166369)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/NameNodeList.cpp 2014-03-27 20:07:36 UTC (rev 166368)
+++ trunk/Source/WebCore/dom/NameNodeList.cpp 2014-03-27 20:49:27 UTC (rev 166369)
</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>- : LiveNodeList(rootNode, Type::NameNodeListType, InvalidateOnNameAttrChange)
</del><ins>+ : CachedLiveNodeList(rootNode, Type::NameNodeListType, InvalidateOnNameAttrChange)
</ins><span class="cx"> , m_name(name)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomNameNodeListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/NameNodeList.h (166368 => 166369)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/NameNodeList.h 2014-03-27 20:07:36 UTC (rev 166368)
+++ trunk/Source/WebCore/dom/NameNodeList.h 2014-03-27 20:49:27 UTC (rev 166369)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> // NodeList which lists all Nodes in a Element with a given "name" attribute
</span><del>-class NameNodeList : public LiveNodeList {
</del><ins>+class NameNodeList final : public CachedLiveNodeList<NameNodeList> {
</ins><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<NameNodeList> create(ContainerNode& rootNode, Type type, const AtomicString& name)
</span><span class="cx"> {
</span><span class="lines">@@ -41,11 +41,11 @@
</span><span class="cx">
</span><span class="cx"> virtual ~NameNodeList();
</span><span class="cx">
</span><ins>+ virtual bool nodeMatches(Element*) const override;
+
</ins><span class="cx"> private:
</span><span class="cx"> NameNodeList(ContainerNode& rootNode, const AtomicString& name);
</span><span class="cx">
</span><del>- virtual bool nodeMatches(Element*) const override;
-
</del><span class="cx"> AtomicString m_name;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.cpp (166368 => 166369)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.cpp 2014-03-27 20:07:36 UTC (rev 166368)
+++ trunk/Source/WebCore/dom/Node.cpp 2014-03-27 20:49:27 UTC (rev 166369)
</span><span class="lines">@@ -726,7 +726,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> HashSet<LiveNodeList*> lists = std::move(m_listsInvalidatedAtDocument);
</span><span class="cx"> for (auto* list : lists)
</span><del>- list->invalidateCache(attrName);
</del><ins>+ list->invalidateCacheForAttribute(attrName);
</ins><span class="cx"> HashSet<HTMLCollection*> collections = std::move(m_collectionsInvalidatedAtDocument);
</span><span class="cx"> for (auto* collection : collections)
</span><span class="cx"> collection->invalidateCache(attrName);
</span><span class="lines">@@ -1685,10 +1685,10 @@
</span><span class="cx"> void NodeListsNodeData::invalidateCaches(const QualifiedName* attrName)
</span><span class="cx"> {
</span><span class="cx"> for (auto& atomicName : m_atomicNameCaches)
</span><del>- atomicName.value->invalidateCache(attrName);
</del><ins>+ atomicName.value->invalidateCacheForAttribute(attrName);
</ins><span class="cx">
</span><span class="cx"> for (auto& name : m_nameCaches)
</span><del>- name.value->invalidateCache(attrName);
</del><ins>+ name.value->invalidateCacheForAttribute(attrName);
</ins><span class="cx">
</span><span class="cx"> for (auto& collection : m_cachedCollections)
</span><span class="cx"> collection.value->invalidateCache(attrName);
</span><span class="lines">@@ -1697,7 +1697,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> for (auto& tagNodeList : m_tagNodeListCacheNS)
</span><del>- tagNodeList.value->invalidateCache(nullptr);
</del><ins>+ tagNodeList.value->invalidateCacheForAttribute(nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Node::getSubresourceURLs(ListHashSet<URL>& urls) const
</span></span></pre></div>
<a id="trunkSourceWebCoredomTagNodeListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/TagNodeList.cpp (166368 => 166369)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/TagNodeList.cpp 2014-03-27 20:07:36 UTC (rev 166368)
+++ trunk/Source/WebCore/dom/TagNodeList.cpp 2014-03-27 20:49:27 UTC (rev 166369)
</span><span class="lines">@@ -28,8 +28,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-TagNodeList::TagNodeList(ContainerNode& rootNode, Type type, const AtomicString& namespaceURI, const AtomicString& localName)
- : LiveNodeList(rootNode, type, DoNotInvalidateOnAttributeChanges)
</del><ins>+TagNodeList::TagNodeList(ContainerNode& rootNode, const AtomicString& namespaceURI, const AtomicString& localName)
+ : CachedLiveNodeList(rootNode, Type::TagNodeListType, DoNotInvalidateOnAttributeChanges)
</ins><span class="cx"> , m_namespaceURI(namespaceURI)
</span><span class="cx"> , m_localName(localName)
</span><span class="cx"> {
</span><span class="lines">@@ -44,24 +44,16 @@
</span><span class="cx"> ownerNode().nodeLists()->removeCacheWithQualifiedName(this, m_namespaceURI, m_localName);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool TagNodeList::nodeMatches(Element* testNode) const
-{
- // Implements http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#concept-getelementsbytagnamens
- if (m_localName != starAtom && m_localName != testNode->localName())
- return false;
-
- return m_namespaceURI == starAtom || m_namespaceURI == testNode->namespaceURI();
-}
-
</del><span class="cx"> HTMLTagNodeList::HTMLTagNodeList(ContainerNode& rootNode, const AtomicString& localName)
</span><del>- : TagNodeList(rootNode, Type::HTMLTagNodeListType, starAtom, localName)
</del><ins>+ : CachedLiveNodeList(rootNode, Type::HTMLTagNodeListType, DoNotInvalidateOnAttributeChanges)
+ , m_localName(localName)
</ins><span class="cx"> , m_loweredLocalName(localName.lower())
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool HTMLTagNodeList::nodeMatches(Element* testNode) const
</del><ins>+HTMLTagNodeList::~HTMLTagNodeList()
</ins><span class="cx"> {
</span><del>- return nodeMatchesInlined(testNode);
</del><ins>+ ownerNode().nodeLists()->removeCacheWithAtomicName(this, m_localName);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoredomTagNodeListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/TagNodeList.h (166368 => 166369)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/TagNodeList.h 2014-03-27 20:07:36 UTC (rev 166368)
+++ trunk/Source/WebCore/dom/TagNodeList.h 2014-03-27 20:49:27 UTC (rev 166369)
</span><span class="lines">@@ -31,32 +31,41 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> // NodeList that limits to a particular tag.
</span><del>-class TagNodeList : public LiveNodeList {
</del><ins>+class TagNodeList final : public CachedLiveNodeList<TagNodeList> {
</ins><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<TagNodeList> create(ContainerNode& rootNode, const AtomicString& namespaceURI, const AtomicString& localName)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(namespaceURI != starAtom);
</span><del>- return adoptRef(new TagNodeList(rootNode, Type::TagNodeListType, namespaceURI, localName));
</del><ins>+ return adoptRef(new TagNodeList(rootNode, namespaceURI, localName));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static PassRefPtr<TagNodeList> create(ContainerNode& rootNode, Type type, const AtomicString& localName)
</span><span class="cx"> {
</span><span class="cx"> ASSERT_UNUSED(type, type == Type::TagNodeListType);
</span><del>- return adoptRef(new TagNodeList(rootNode, Type::TagNodeListType, starAtom, localName));
</del><ins>+ return adoptRef(new TagNodeList(rootNode, starAtom, localName));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual ~TagNodeList();
</span><span class="cx">
</span><ins>+ virtual bool nodeMatches(Element*) const override;
+
</ins><span class="cx"> protected:
</span><del>- TagNodeList(ContainerNode& rootNode, Type, const AtomicString& namespaceURI, const AtomicString& localName);
</del><ins>+ TagNodeList(ContainerNode& rootNode, const AtomicString& namespaceURI, const AtomicString& localName);
</ins><span class="cx">
</span><del>- virtual bool nodeMatches(Element*) const override;
-
</del><span class="cx"> AtomicString m_namespaceURI;
</span><span class="cx"> AtomicString m_localName;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class HTMLTagNodeList : public TagNodeList {
</del><ins>+inline bool TagNodeList::nodeMatches(Element* element) const
+{
+ // Implements http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#concept-getelementsbytagnamens
+ if (m_localName != starAtom && m_localName != element->localName())
+ return false;
+
+ return m_namespaceURI == starAtom || m_namespaceURI == element->namespaceURI();
+}
+
+class HTMLTagNodeList final : public CachedLiveNodeList<HTMLTagNodeList> {
</ins><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<HTMLTagNodeList> create(ContainerNode& rootNode, Type type, const AtomicString& localName)
</span><span class="cx"> {
</span><span class="lines">@@ -64,26 +73,24 @@
</span><span class="cx"> return adoptRef(new HTMLTagNodeList(rootNode, localName));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool nodeMatchesInlined(Element*) const;
</del><ins>+ virtual ~HTMLTagNodeList();
</ins><span class="cx">
</span><ins>+ virtual bool nodeMatches(Element*) const override;
+
</ins><span class="cx"> private:
</span><span class="cx"> HTMLTagNodeList(ContainerNode& rootNode, const AtomicString& localName);
</span><span class="cx">
</span><del>- virtual bool nodeMatches(Element*) const override;
-
</del><ins>+ AtomicString m_localName;
</ins><span class="cx"> AtomicString m_loweredLocalName;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-inline bool HTMLTagNodeList::nodeMatchesInlined(Element* testNode) const
</del><ins>+inline bool HTMLTagNodeList::nodeMatches(Element* element) const
</ins><span class="cx"> {
</span><span class="cx"> // Implements http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#concept-getelementsbytagname
</span><del>- if (m_localName != starAtom) {
- const AtomicString& localName = testNode->isHTMLElement() ? m_loweredLocalName : m_localName;
- if (localName != testNode->localName())
- return false;
- }
- ASSERT(m_namespaceURI == starAtom);
- return true;
</del><ins>+ if (m_localName == starAtom)
+ return true;
+ const AtomicString& localName = element->isHTMLElement() ? m_loweredLocalName : m_localName;
+ return localName == element->localName();
</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 (166368 => 166369)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/LabelsNodeList.cpp 2014-03-27 20:07:36 UTC (rev 166368)
+++ trunk/Source/WebCore/html/LabelsNodeList.cpp 2014-03-27 20:49:27 UTC (rev 166369)
</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>- : LiveNodeList(forNode, Type::LabelsNodeListType, InvalidateOnForAttrChange, NodeListIsRootedAtDocument)
</del><ins>+ : CachedLiveNodeList(forNode, Type::LabelsNodeListType, 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 (166368 => 166369)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/LabelsNodeList.h 2014-03-27 20:07:36 UTC (rev 166368)
+++ trunk/Source/WebCore/html/LabelsNodeList.h 2014-03-27 20:49:27 UTC (rev 166369)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class LabelsNodeList final : public LiveNodeList {
</del><ins>+class LabelsNodeList final : public CachedLiveNodeList<LabelsNodeList> {
</ins><span class="cx"> public:
</span><span class="cx"> static PassRef<LabelsNodeList> create(LabelableElement& forNode, Type type, const AtomicString&)
</span><span class="cx"> {
</span><span class="lines">@@ -39,10 +39,10 @@
</span><span class="cx"> }
</span><span class="cx"> ~LabelsNodeList();
</span><span class="cx">
</span><del>-protected:
</del><ins>+ virtual bool nodeMatches(Element*) const override;
+
+private:
</ins><span class="cx"> explicit LabelsNodeList(LabelableElement& forNode);
</span><del>-
- virtual bool nodeMatches(Element*) const override;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlRadioNodeListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/RadioNodeList.cpp (166368 => 166369)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/RadioNodeList.cpp 2014-03-27 20:07:36 UTC (rev 166368)
+++ trunk/Source/WebCore/html/RadioNodeList.cpp 2014-03-27 20:49:27 UTC (rev 166369)
</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>- : LiveNodeList(rootNode, Type::RadioNodeListType, InvalidateForFormControls, isHTMLFormElement(rootNode) ? NodeListIsRootedAtDocument : NodeListIsRootedAtNode)
</del><ins>+ : CachedLiveNodeList(rootNode, Type::RadioNodeListType, 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 (166368 => 166369)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/RadioNodeList.h 2014-03-27 20:07:36 UTC (rev 166368)
+++ trunk/Source/WebCore/html/RadioNodeList.h 2014-03-27 20:49:27 UTC (rev 166369)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class RadioNodeList : public LiveNodeList {
</del><ins>+class RadioNodeList final : public CachedLiveNodeList<RadioNodeList> {
</ins><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<RadioNodeList> create(ContainerNode& rootNode, Type type, const AtomicString& name)
</span><span class="cx"> {
</span><span class="lines">@@ -45,7 +45,6 @@
</span><span class="cx"> String value() const;
</span><span class="cx"> void setValue(const String&);
</span><span class="cx">
</span><del>-protected:
</del><span class="cx"> virtual bool nodeMatches(Element*) const override;
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre>
</div>
</div>
</body>
</html>