<!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>[166407] 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/166407">166407</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2014-03-28 08:36:40 -0700 (Fri, 28 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove NodeListRootType flag
https://bugs.webkit.org/show_bug.cgi?id=130896
Reviewed by Anders Carlsson.
This can be handled statically (except for the RadioNodeList case) removing
a branch from NodeList traversal.
* dom/ClassNodeList.h:
* dom/Document.cpp:
(WebCore::Document::registerNodeListForInvalidation):
(WebCore::Document::unregisterNodeListForInvalidation):
(WebCore::Document::registerNodeList): Deleted.
(WebCore::Document::unregisterNodeList): Deleted.
Mark document invalidation registered lists with a bit.
Renamed for clarity.
* dom/Document.h:
* dom/LiveNodeList.cpp:
(WebCore::LiveNodeList::LiveNodeList):
(WebCore::LiveNodeList::rootNode):
Base class version that invokes virtual isRootedAtDocument. It is needed to support
LiveNodeList::namedItem.
* dom/LiveNodeList.h:
(WebCore::LiveNodeList::isRegisteredForInvalidationAtDocument):
(WebCore::LiveNodeList::setRegisteredForInvalidationAtDocument):
(WebCore::LiveNodeList::document):
(WebCore::CachedLiveNodeList<NodeListType>::CachedLiveNodeList):
(WebCore::CachedLiveNodeList<NodeListType>::~CachedLiveNodeList):
(WebCore::CachedLiveNodeList<NodeListType>::rootNode):
Call isRootedAtDocument on the final leaf type. Except for RadioNodeList this
resolves statically.
(WebCore::CachedLiveNodeList<NodeListType>::willValidateIndexCache):
(WebCore::CachedLiveNodeList<NodeListType>::invalidateCache):
(WebCore::LiveNodeList::isRootedAtDocument): Deleted.
(WebCore::LiveNodeList::rootType): Deleted.
(WebCore::LiveNodeList::rootNode): Deleted.
* dom/NameNodeList.h:
* dom/NodeRareData.h:
(WebCore::NodeListsNodeData::adoptDocument):
* dom/TagNodeList.h:
* html/HTMLCollection.cpp:
(WebCore::rootTypeFromCollectionType):
* html/HTMLCollection.h:
(WebCore::HTMLCollection::isRootedAtDocument):
(WebCore::HTMLCollection::rootType):
HTMLCollections still needs the flag.
* 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="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.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="#trunkSourceWebCoredomTagNodeListcpp">trunk/Source/WebCore/dom/TagNodeList.cpp</a></li>
<li><a href="#trunkSourceWebCoredomTagNodeListh">trunk/Source/WebCore/dom/TagNodeList.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLCollectioncpp">trunk/Source/WebCore/html/HTMLCollection.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLCollectionh">trunk/Source/WebCore/html/HTMLCollection.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 (166406 => 166407)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-28 15:34:03 UTC (rev 166406)
+++ trunk/Source/WebCore/ChangeLog 2014-03-28 15:36:40 UTC (rev 166407)
</span><span class="lines">@@ -1,3 +1,66 @@
</span><ins>+2014-03-28 Antti Koivisto <antti@apple.com>
+
+ Remove NodeListRootType flag
+ https://bugs.webkit.org/show_bug.cgi?id=130896
+
+ Reviewed by Anders Carlsson.
+
+ This can be handled statically (except for the RadioNodeList case) removing
+ a branch from NodeList traversal.
+
+ * dom/ClassNodeList.h:
+ * dom/Document.cpp:
+ (WebCore::Document::registerNodeListForInvalidation):
+ (WebCore::Document::unregisterNodeListForInvalidation):
+ (WebCore::Document::registerNodeList): Deleted.
+ (WebCore::Document::unregisterNodeList): Deleted.
+
+ Mark document invalidation registered lists with a bit.
+ Renamed for clarity.
+
+ * dom/Document.h:
+ * dom/LiveNodeList.cpp:
+ (WebCore::LiveNodeList::LiveNodeList):
+ (WebCore::LiveNodeList::rootNode):
+
+ Base class version that invokes virtual isRootedAtDocument. It is needed to support
+ LiveNodeList::namedItem.
+
+ * dom/LiveNodeList.h:
+ (WebCore::LiveNodeList::isRegisteredForInvalidationAtDocument):
+ (WebCore::LiveNodeList::setRegisteredForInvalidationAtDocument):
+ (WebCore::LiveNodeList::document):
+ (WebCore::CachedLiveNodeList<NodeListType>::CachedLiveNodeList):
+ (WebCore::CachedLiveNodeList<NodeListType>::~CachedLiveNodeList):
+ (WebCore::CachedLiveNodeList<NodeListType>::rootNode):
+
+ Call isRootedAtDocument on the final leaf type. Except for RadioNodeList this
+ resolves statically.
+
+ (WebCore::CachedLiveNodeList<NodeListType>::willValidateIndexCache):
+ (WebCore::CachedLiveNodeList<NodeListType>::invalidateCache):
+ (WebCore::LiveNodeList::isRootedAtDocument): Deleted.
+ (WebCore::LiveNodeList::rootType): Deleted.
+ (WebCore::LiveNodeList::rootNode): Deleted.
+ * dom/NameNodeList.h:
+ * dom/NodeRareData.h:
+ (WebCore::NodeListsNodeData::adoptDocument):
+ * dom/TagNodeList.h:
+ * html/HTMLCollection.cpp:
+ (WebCore::rootTypeFromCollectionType):
+ * html/HTMLCollection.h:
+ (WebCore::HTMLCollection::isRootedAtDocument):
+ (WebCore::HTMLCollection::rootType):
+
+ HTMLCollections still needs the flag.
+
+ * html/LabelsNodeList.cpp:
+ (WebCore::LabelsNodeList::LabelsNodeList):
+ * html/LabelsNodeList.h:
+ * html/RadioNodeList.cpp:
+ (WebCore::RadioNodeList::RadioNodeList):
+ * html/RadioNodeList.h:
+
</ins><span class="cx"> 2014-03-28 Mario Sanchez Prada <mario.prada@samsung.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Geoclue2 providers won't work after reloading
</span></span></pre></div>
<a id="trunkSourceWebCoredomClassNodeListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ClassNodeList.cpp (166406 => 166407)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ClassNodeList.cpp 2014-03-28 15:34:03 UTC (rev 166406)
+++ trunk/Source/WebCore/dom/ClassNodeList.cpp 2014-03-28 15:36:40 UTC (rev 166407)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2007-2008, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2007 David Smith (catfish.man@gmail.com)
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span></span></pre></div>
<a id="trunkSourceWebCoredomClassNodeListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ClassNodeList.h (166406 => 166407)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ClassNodeList.h 2014-03-28 15:34:03 UTC (rev 166406)
+++ trunk/Source/WebCore/dom/ClassNodeList.h 2014-03-28 15:36:40 UTC (rev 166407)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2007 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2007, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2007 David Smith (catfish.man@gmail.com)
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> virtual ~ClassNodeList();
</span><span class="cx">
</span><span class="cx"> virtual bool nodeMatches(Element*) const override;
</span><ins>+ virtual bool isRootedAtDocument() const override { return false; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> ClassNodeList(ContainerNode& rootNode, const String& classNames);
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (166406 => 166407)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2014-03-28 15:34:03 UTC (rev 166406)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-03-28 15:36:40 UTC (rev 166407)
</span><span class="lines">@@ -3452,24 +3452,28 @@
</span><span class="cx"> n->didAffectSelector(AffectedSelectorTarget);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Document::registerNodeList(LiveNodeList& list)
</del><ins>+void Document::registerNodeListForInvalidation(LiveNodeList& list)
</ins><span class="cx"> {
</span><span class="cx"> m_nodeListAndCollectionCounts[list.invalidationType()]++;
</span><del>- if (list.isRootedAtDocument())
- m_listsInvalidatedAtDocument.add(&list);
</del><ins>+ if (!list.isRootedAtDocument())
+ return;
+ ASSERT(!list.isRegisteredForInvalidationAtDocument());
+ list.setRegisteredForInvalidationAtDocument(true);
+ m_listsInvalidatedAtDocument.add(&list);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void Document::unregisterNodeList(LiveNodeList& list)
</del><ins>+void Document::unregisterNodeListForInvalidation(LiveNodeList& list)
</ins><span class="cx"> {
</span><span class="cx"> m_nodeListAndCollectionCounts[list.invalidationType()]--;
</span><del>- if (list.isRootedAtDocument()) {
- if (!m_listsInvalidatedAtDocument.size()) {
- ASSERT(m_inInvalidateNodeListAndCollectionCaches);
- return;
- }
- ASSERT(m_listsInvalidatedAtDocument.contains(&list));
- m_listsInvalidatedAtDocument.remove(&list);
</del><ins>+ if (!list.isRegisteredForInvalidationAtDocument())
+ return;
+ if (!m_listsInvalidatedAtDocument.size()) {
+ ASSERT(m_inInvalidateNodeListAndCollectionCaches);
+ return;
</ins><span class="cx"> }
</span><ins>+ ASSERT(m_listsInvalidatedAtDocument.contains(&list));
+ m_listsInvalidatedAtDocument.remove(&list);
+ list.setRegisteredForInvalidationAtDocument(false);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Document::registerCollection(HTMLCollection& collection)
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (166406 => 166407)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2014-03-28 15:34:03 UTC (rev 166406)
+++ trunk/Source/WebCore/dom/Document.h 2014-03-28 15:36:40 UTC (rev 166407)
</span><span class="lines">@@ -761,8 +761,8 @@
</span><span class="cx"> void styleRecalcTimerFired(Timer<Document>&);
</span><span class="cx"> void optimizedStyleSheetUpdateTimerFired(Timer<Document>&);
</span><span class="cx">
</span><del>- void registerNodeList(LiveNodeList&);
- void unregisterNodeList(LiveNodeList&);
</del><ins>+ void registerNodeListForInvalidation(LiveNodeList&);
+ void unregisterNodeListForInvalidation(LiveNodeList&);
</ins><span class="cx"> void registerCollection(HTMLCollection&);
</span><span class="cx"> void unregisterCollection(HTMLCollection&);
</span><span class="cx"> void collectionCachedIdNameMap(const HTMLCollection&);
</span></span></pre></div>
<a id="trunkSourceWebCoredomLiveNodeListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/LiveNodeList.cpp (166406 => 166407)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/LiveNodeList.cpp 2014-03-28 15:34:03 UTC (rev 166406)
+++ trunk/Source/WebCore/dom/LiveNodeList.cpp 2014-03-28 15:36:40 UTC (rev 166407)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
</span><span class="cx"> * (C) 1999 Antti Koivisto (koivisto@kde.org)
</span><span class="cx"> * (C) 2001 Dirk Mueller (mueller@kde.org)
</span><del>- * Copyright (C) 2004, 2006, 2007, 2008, 2010, 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2004, 2006-2008, 2010, 2013-2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="cx"> * modify it under the terms of the GNU Library General Public
</span><span class="lines">@@ -31,12 +31,11 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-LiveNodeList::LiveNodeList(ContainerNode& ownerNode, NodeListInvalidationType invalidationType, NodeListRootType rootType)
</del><ins>+LiveNodeList::LiveNodeList(ContainerNode& ownerNode, NodeListInvalidationType invalidationType)
</ins><span class="cx"> : m_ownerNode(ownerNode)
</span><del>- , m_rootType(rootType)
</del><span class="cx"> , m_invalidationType(invalidationType)
</span><ins>+ , m_isRegisteredForInvalidationAtDocument(false)
</ins><span class="cx"> {
</span><del>- ASSERT(m_rootType == static_cast<unsigned>(rootType));
</del><span class="cx"> ASSERT(m_invalidationType == static_cast<unsigned>(invalidationType));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -44,7 +43,14 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ContainerNode& LiveNodeList::rootNode() const
+{
+ if (isRootedAtDocument() && ownerNode().inDocument())
+ return ownerNode().document();
</ins><span class="cx">
</span><ins>+ return ownerNode();
+}
+
</ins><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></pre></div>
<a id="trunkSourceWebCoredomLiveNodeListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/LiveNodeList.h (166406 => 166407)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/LiveNodeList.h 2014-03-28 15:34:03 UTC (rev 166406)
+++ trunk/Source/WebCore/dom/LiveNodeList.h 2014-03-28 15:36:40 UTC (rev 166407)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
</span><span class="cx"> * (C) 1999 Antti Koivisto (koivisto@kde.org)
</span><span class="cx"> * (C) 2001 Dirk Mueller (mueller@kde.org)
</span><del>- * Copyright (C) 2004, 2006, 2007, 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2004, 2006-2007, 2013-2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="cx"> * modify it under the terms of the GNU Library General Public
</span><span class="lines">@@ -37,22 +37,18 @@
</span><span class="cx">
</span><span class="cx"> class Element;
</span><span class="cx">
</span><del>-enum NodeListRootType {
- NodeListIsRootedAtNode,
- NodeListIsRootedAtDocument
-};
-
</del><span class="cx"> static bool shouldInvalidateTypeOnAttributeChange(NodeListInvalidationType, const QualifiedName&);
</span><span class="cx">
</span><span class="cx"> class LiveNodeList : public NodeList {
</span><span class="cx"> public:
</span><del>- LiveNodeList(ContainerNode& ownerNode, NodeListInvalidationType, NodeListRootType);
</del><ins>+ LiveNodeList(ContainerNode& ownerNode, NodeListInvalidationType);
+ virtual ~LiveNodeList();
+
</ins><span class="cx"> virtual Node* namedItem(const AtomicString&) const override final;
</span><ins>+
</ins><span class="cx"> virtual bool nodeMatches(Element*) const = 0;
</span><ins>+ virtual bool isRootedAtDocument() const = 0;
</ins><span class="cx">
</span><del>- virtual ~LiveNodeList();
-
- ALWAYS_INLINE bool isRootedAtDocument() const { return m_rootType == NodeListIsRootedAtDocument; }
</del><span class="cx"> ALWAYS_INLINE NodeListInvalidationType invalidationType() const { return static_cast<NodeListInvalidationType>(m_invalidationType); }
</span><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="lines">@@ -62,21 +58,23 @@
</span><span class="cx"> }
</span><span class="cx"> virtual void invalidateCache(Document&) const = 0;
</span><span class="cx">
</span><ins>+ bool isRegisteredForInvalidationAtDocument() const { return m_isRegisteredForInvalidationAtDocument; }
+ void setRegisteredForInvalidationAtDocument(bool f) { m_isRegisteredForInvalidationAtDocument = f; }
+
</ins><span class="cx"> protected:
</span><span class="cx"> Document& document() const { return m_ownerNode->document(); }
</span><del>- ContainerNode& rootNode() const;
</del><span class="cx">
</span><del>- ALWAYS_INLINE NodeListRootType rootType() const { return static_cast<NodeListRootType>(m_rootType); }
-
</del><span class="cx"> private:
</span><del>- virtual bool isLiveNodeList() const override { return true; }
</del><ins>+ virtual bool isLiveNodeList() const override final { return true; }
</ins><span class="cx">
</span><ins>+ ContainerNode& rootNode() const;
+
</ins><span class="cx"> Element* iterateForPreviousElement(Element* current) const;
</span><span class="cx">
</span><span class="cx"> Ref<ContainerNode> m_ownerNode;
</span><span class="cx">
</span><del>- const unsigned m_rootType : 1;
- const unsigned m_invalidationType : 4;
</del><ins>+ const unsigned m_invalidationType;
+ bool m_isRegisteredForInvalidationAtDocument;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template <class NodeListType>
</span><span class="lines">@@ -99,9 +97,11 @@
</span><span class="cx"> virtual size_t memoryCost() const override;
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- CachedLiveNodeList(ContainerNode& rootNode, NodeListInvalidationType, NodeListRootType = NodeListIsRootedAtNode);
</del><ins>+ CachedLiveNodeList(ContainerNode& rootNode, NodeListInvalidationType);
</ins><span class="cx">
</span><span class="cx"> private:
</span><ins>+ ContainerNode& rootNode() const;
+
</ins><span class="cx"> mutable CollectionIndexCache<NodeListType, Element> m_indexCache;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -129,25 +129,26 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline ContainerNode& LiveNodeList::rootNode() const
</del><ins>+template <class NodeListType>
+CachedLiveNodeList<NodeListType>::CachedLiveNodeList(ContainerNode& ownerNode, NodeListInvalidationType invalidationType)
+ : LiveNodeList(ownerNode, invalidationType)
</ins><span class="cx"> {
</span><del>- if (isRootedAtDocument() && ownerNode().inDocument())
- return ownerNode().document();
-
- return ownerNode();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <class NodeListType>
</span><del>-CachedLiveNodeList<NodeListType>::CachedLiveNodeList(ContainerNode& ownerNode, NodeListInvalidationType invalidationType, NodeListRootType rootType)
- : LiveNodeList(ownerNode, invalidationType, rootType)
</del><ins>+CachedLiveNodeList<NodeListType>::~CachedLiveNodeList()
</ins><span class="cx"> {
</span><ins>+ if (m_indexCache.hasValidCache())
+ document().unregisterNodeListForInvalidation(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <class NodeListType>
</span><del>-CachedLiveNodeList<NodeListType>::~CachedLiveNodeList()
</del><ins>+inline ContainerNode& CachedLiveNodeList<NodeListType>::rootNode() const
</ins><span class="cx"> {
</span><del>- if (m_indexCache.hasValidCache())
- document().unregisterNodeList(*this);
</del><ins>+ if (static_cast<const NodeListType&>(*this).isRootedAtDocument() && ownerNode().inDocument())
+ return ownerNode().document();
+
+ return ownerNode();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <class NodeListType>
</span><span class="lines">@@ -216,7 +217,7 @@
</span><span class="cx"> template <class NodeListType>
</span><span class="cx"> void CachedLiveNodeList<NodeListType>::willValidateIndexCache() const
</span><span class="cx"> {
</span><del>- document().registerNodeList(const_cast<NodeListType&>(static_cast<const NodeListType&>(*this)));
</del><ins>+ document().registerNodeListForInvalidation(const_cast<NodeListType&>(static_cast<const NodeListType&>(*this)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <class NodeListType>
</span><span class="lines">@@ -224,7 +225,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_indexCache.hasValidCache())
</span><span class="cx"> return;
</span><del>- document.unregisterNodeList(const_cast<NodeListType&>(static_cast<const NodeListType&>(*this)));
</del><ins>+ document.unregisterNodeListForInvalidation(const_cast<NodeListType&>(static_cast<const NodeListType&>(*this)));
</ins><span class="cx"> m_indexCache.invalidate();
</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 (166406 => 166407)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/NameNodeList.cpp 2014-03-28 15:34:03 UTC (rev 166406)
+++ trunk/Source/WebCore/dom/NameNodeList.cpp 2014-03-28 15:36:40 UTC (rev 166407)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
</span><span class="cx"> * (C) 1999 Antti Koivisto (koivisto@kde.org)
</span><span class="cx"> * (C) 2001 Dirk Mueller (mueller@kde.org)
</span><del>- * Copyright (C) 2004, 2007 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2004, 2007, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="cx"> * modify it under the terms of the GNU Library General Public
</span></span></pre></div>
<a id="trunkSourceWebCoredomNameNodeListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/NameNodeList.h (166406 => 166407)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/NameNodeList.h 2014-03-28 15:34:03 UTC (rev 166406)
+++ trunk/Source/WebCore/dom/NameNodeList.h 2014-03-28 15:36:40 UTC (rev 166407)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
</span><span class="cx"> * (C) 1999 Antti Koivisto (koivisto@kde.org)
</span><span class="cx"> * (C) 2001 Dirk Mueller (mueller@kde.org)
</span><del>- * Copyright (C) 2004, 2007m 2008 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2004, 2007-2008, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="cx"> * modify it under the terms of the GNU Library General Public
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> virtual ~NameNodeList();
</span><span class="cx">
</span><span class="cx"> virtual bool nodeMatches(Element*) const override;
</span><ins>+ virtual bool isRootedAtDocument() const override { return false; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> NameNodeList(ContainerNode& rootNode, const AtomicString& name);
</span></span></pre></div>
<a id="trunkSourceWebCoredomTagNodeListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/TagNodeList.cpp (166406 => 166407)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/TagNodeList.cpp 2014-03-28 15:34:03 UTC (rev 166406)
+++ trunk/Source/WebCore/dom/TagNodeList.cpp 2014-03-28 15:36:40 UTC (rev 166407)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
</span><span class="cx"> * (C) 1999 Antti Koivisto (koivisto@kde.org)
</span><span class="cx"> * (C) 2001 Dirk Mueller (mueller@kde.org)
</span><del>- * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2004-2007, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
</span><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span></span></pre></div>
<a id="trunkSourceWebCoredomTagNodeListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/TagNodeList.h (166406 => 166407)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/TagNodeList.h 2014-03-28 15:34:03 UTC (rev 166406)
+++ trunk/Source/WebCore/dom/TagNodeList.h 2014-03-28 15:36:40 UTC (rev 166407)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
</span><span class="cx"> * (C) 1999 Antti Koivisto (koivisto@kde.org)
</span><span class="cx"> * (C) 2001 Dirk Mueller (mueller@kde.org)
</span><del>- * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2004-2008, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
</span><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> virtual ~TagNodeList();
</span><span class="cx">
</span><span class="cx"> virtual bool nodeMatches(Element*) const override;
</span><ins>+ virtual bool isRootedAtDocument() const override { return false; }
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> TagNodeList(ContainerNode& rootNode, const AtomicString& namespaceURI, const AtomicString& localName);
</span><span class="lines">@@ -74,6 +75,7 @@
</span><span class="cx"> virtual ~HTMLTagNodeList();
</span><span class="cx">
</span><span class="cx"> virtual bool nodeMatches(Element*) const override;
</span><ins>+ virtual bool isRootedAtDocument() const override { return false; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> HTMLTagNodeList(ContainerNode& rootNode, const AtomicString& localName);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLCollectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLCollection.cpp (166406 => 166407)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLCollection.cpp 2014-03-28 15:34:03 UTC (rev 166406)
+++ trunk/Source/WebCore/html/HTMLCollection.cpp 2014-03-28 15:36:40 UTC (rev 166407)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static NodeListRootType rootTypeFromCollectionType(CollectionType type)
</del><ins>+static HTMLCollection::RootType rootTypeFromCollectionType(CollectionType type)
</ins><span class="cx"> {
</span><span class="cx"> switch (type) {
</span><span class="cx"> case DocImages:
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> case WindowNamedItems:
</span><span class="cx"> case DocumentNamedItems:
</span><span class="cx"> case FormControls:
</span><del>- return NodeListIsRootedAtDocument;
</del><ins>+ return HTMLCollection::IsRootedAtDocument;
</ins><span class="cx"> case NodeChildren:
</span><span class="cx"> case TableTBodies:
</span><span class="cx"> case TSectionRows:
</span><span class="lines">@@ -89,10 +89,10 @@
</span><span class="cx"> case SelectedOptions:
</span><span class="cx"> case DataListOptions:
</span><span class="cx"> case MapAreas:
</span><del>- return NodeListIsRootedAtNode;
</del><ins>+ return HTMLCollection::IsRootedAtNode;
</ins><span class="cx"> }
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><del>- return NodeListIsRootedAtNode;
</del><ins>+ return HTMLCollection::IsRootedAtNode;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static NodeListInvalidationType invalidationTypeExcludingIdAndNameAttributes(CollectionType type)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLCollectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLCollection.h (166406 => 166407)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLCollection.h 2014-03-28 15:34:03 UTC (rev 166406)
+++ trunk/Source/WebCore/html/HTMLCollection.h 2014-03-28 15:36:40 UTC (rev 166407)
</span><span class="lines">@@ -100,7 +100,11 @@
</span><span class="cx"> void namedItems(const AtomicString& name, Vector<Ref<Element>>&) const;
</span><span class="cx"> size_t memoryCost() const { return m_indexCache.memoryCost() + (m_namedElementCache ? m_namedElementCache->memoryCost() : 0); }
</span><span class="cx">
</span><del>- bool isRootedAtDocument() const { return m_rootType == NodeListIsRootedAtDocument; }
</del><ins>+ enum RootType {
+ IsRootedAtNode,
+ IsRootedAtDocument
+ };
+ bool isRootedAtDocument() const { return m_rootType == IsRootedAtDocument; }
</ins><span class="cx"> NodeListInvalidationType invalidationType() const { return static_cast<NodeListInvalidationType>(m_invalidationType); }
</span><span class="cx"> CollectionType type() const { return static_cast<CollectionType>(m_collectionType); }
</span><span class="cx"> ContainerNode& ownerNode() const { return const_cast<ContainerNode&>(m_ownerNode.get()); }
</span><span class="lines">@@ -133,7 +137,7 @@
</span><span class="cx"> ContainerNode& rootNode() const;
</span><span class="cx"> bool usesCustomForwardOnlyTraversal() const { return m_usesCustomForwardOnlyTraversal; }
</span><span class="cx">
</span><del>- NodeListRootType rootType() const { return static_cast<NodeListRootType>(m_rootType); }
</del><ins>+ RootType rootType() const { return static_cast<RootType>(m_rootType); }
</ins><span class="cx">
</span><span class="cx"> CollectionNamedElementCache& createNameItemCache() const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlLabelsNodeListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/LabelsNodeList.cpp (166406 => 166407)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/LabelsNodeList.cpp 2014-03-28 15:34:03 UTC (rev 166406)
+++ trunk/Source/WebCore/html/LabelsNodeList.cpp 2014-03-28 15:36:40 UTC (rev 166407)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
</span><span class="cx"> * (C) 1999 Antti Koivisto (koivisto@kde.org)
</span><span class="cx"> * (C) 2001 Dirk Mueller (mueller@kde.org)
</span><del>- * Copyright (C) 2004, 2007, 2008 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2004, 2007, 2008, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2010 Nokia Inc. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</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, InvalidateOnForAttrChange, NodeListIsRootedAtDocument)
</del><ins>+ : CachedLiveNodeList(forNode, InvalidateOnForAttrChange)
</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 (166406 => 166407)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/LabelsNodeList.h 2014-03-28 15:34:03 UTC (rev 166406)
+++ trunk/Source/WebCore/html/LabelsNodeList.h 2014-03-28 15:36:40 UTC (rev 166407)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
</span><span class="cx"> * (C) 1999 Antti Koivisto (koivisto@kde.org)
</span><span class="cx"> * (C) 2001 Dirk Mueller (mueller@kde.org)
</span><del>- * Copyright (C) 2004, 2007 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2004, 2007, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2010 Nokia Inc. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> ~LabelsNodeList();
</span><span class="cx">
</span><span class="cx"> virtual bool nodeMatches(Element*) const override;
</span><ins>+ virtual bool isRootedAtDocument() const override { return true; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> explicit LabelsNodeList(LabelableElement& forNode);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlRadioNodeListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/RadioNodeList.cpp (166406 => 166407)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/RadioNodeList.cpp 2014-03-28 15:34:03 UTC (rev 166406)
+++ trunk/Source/WebCore/html/RadioNodeList.cpp 2014-03-28 15:36:40 UTC (rev 166407)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (c) 2012 Motorola Mobility, Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -38,8 +39,9 @@
</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, InvalidateForFormControls, isHTMLFormElement(rootNode) ? NodeListIsRootedAtDocument : NodeListIsRootedAtNode)
</del><ins>+ : CachedLiveNodeList(rootNode, InvalidateForFormControls)
</ins><span class="cx"> , m_name(name)
</span><ins>+ , m_isRootedAtDocument(isHTMLFormElement(ownerNode()))
</ins><span class="cx"> {
</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 (166406 => 166407)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/RadioNodeList.h 2014-03-28 15:34:03 UTC (rev 166406)
+++ trunk/Source/WebCore/html/RadioNodeList.h 2014-03-28 15:36:40 UTC (rev 166407)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (c) 2012 Motorola Mobility, Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -45,12 +46,14 @@
</span><span class="cx"> void setValue(const String&);
</span><span class="cx">
</span><span class="cx"> virtual bool nodeMatches(Element*) const override;
</span><ins>+ virtual bool isRootedAtDocument() const override { return m_isRootedAtDocument; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> RadioNodeList(ContainerNode&, const AtomicString& name);
</span><span class="cx"> bool checkElementMatchesRadioNodeListFilter(Element*) const;
</span><span class="cx">
</span><span class="cx"> AtomicString m_name;
</span><ins>+ bool m_isRootedAtDocument;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namepsace
</span></span></pre>
</div>
</div>
</body>
</html>