<!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>[161196] 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/161196">161196</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2014-01-01 13:48:13 -0800 (Wed, 01 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove elementChildren/elementDescendants shorthands
https://bugs.webkit.org/show_bug.cgi?id=126363
Reviewed by Anders Carlsson.
Just use childrenOfType<Element>/descendantsOfType<Element> instead. They are not that much longer
and consistency is valuable.
* accessibility/AccessibilityNodeObject.cpp:
(WebCore::AccessibilityNodeObject::canvasHasFallbackContent):
(WebCore::siblingWithAriaRole):
* accessibility/AccessibilityTable.cpp:
(WebCore::AccessibilityTable::isDataTable):
* css/StyleInvalidationAnalysis.cpp:
(WebCore::StyleInvalidationAnalysis::invalidateStyle):
* dom/ChildNodeList.cpp:
(WebCore::ChildNodeList::namedItem):
* dom/Document.cpp:
(WebCore::Document::buildAccessKeyMap):
(WebCore::Document::childrenChanged):
* dom/Element.cpp:
(WebCore::Element::resetComputedStyle):
* dom/ElementChildIterator.h:
* dom/ElementDescendantIterator.h:
* dom/SelectorQuery.cpp:
(WebCore::elementsForLocalName):
(WebCore::anyElement):
(WebCore::SelectorDataList::executeSingleTagNameSelectorData):
(WebCore::SelectorDataList::executeSingleClassNameSelectorData):
(WebCore::SelectorDataList::executeSingleSelectorData):
(WebCore::SelectorDataList::executeSingleMultiSelectorData):
* editing/ApplyStyleCommand.cpp:
(WebCore::ApplyStyleCommand::cleanupUnstyledAppleStyleSpans):
* editing/ReplaceSelectionCommand.cpp:
(WebCore::removeHeadContents):
* editing/markup.cpp:
(WebCore::completeURLs):
* html/HTMLFieldSetElement.cpp:
(WebCore::HTMLFieldSetElement::refreshElementsIfNeeded):
* html/HTMLObjectElement.cpp:
(WebCore::HTMLObjectElement::containsJavaApplet):
* loader/PlaceholderDocument.cpp:
(WebCore::PlaceholderDocument::createRenderTree):
* rendering/RenderChildIterator.h:
* svg/SVGSVGElement.cpp:
(WebCore::SVGSVGElement::getElementById):
* svg/SVGUseElement.cpp:
(WebCore::subtreeContainsDisallowedElement):
(WebCore::removeDisallowedElementsFromSubtree):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityNodeObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityTablecpp">trunk/Source/WebCore/accessibility/AccessibilityTable.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleInvalidationAnalysiscpp">trunk/Source/WebCore/css/StyleInvalidationAnalysis.cpp</a></li>
<li><a href="#trunkSourceWebCoredomChildNodeListcpp">trunk/Source/WebCore/dom/ChildNodeList.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementChildIteratorh">trunk/Source/WebCore/dom/ElementChildIterator.h</a></li>
<li><a href="#trunkSourceWebCoredomElementDescendantIteratorh">trunk/Source/WebCore/dom/ElementDescendantIterator.h</a></li>
<li><a href="#trunkSourceWebCoredomSelectorQuerycpp">trunk/Source/WebCore/dom/SelectorQuery.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingApplyStyleCommandcpp">trunk/Source/WebCore/editing/ApplyStyleCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingReplaceSelectionCommandcpp">trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingmarkupcpp">trunk/Source/WebCore/editing/markup.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFieldSetElementcpp">trunk/Source/WebCore/html/HTMLFieldSetElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLObjectElementcpp">trunk/Source/WebCore/html/HTMLObjectElement.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderPlaceholderDocumentcpp">trunk/Source/WebCore/loader/PlaceholderDocument.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderChildIteratorh">trunk/Source/WebCore/rendering/RenderChildIterator.h</a></li>
<li><a href="#trunkSourceWebCoresvgSVGSVGElementcpp">trunk/Source/WebCore/svg/SVGSVGElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGUseElementcpp">trunk/Source/WebCore/svg/SVGUseElement.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161195 => 161196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-01 21:20:51 UTC (rev 161195)
+++ trunk/Source/WebCore/ChangeLog 2014-01-01 21:48:13 UTC (rev 161196)
</span><span class="lines">@@ -1,5 +1,57 @@
</span><span class="cx"> 2014-01-01 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><ins>+ Remove elementChildren/elementDescendants shorthands
+ https://bugs.webkit.org/show_bug.cgi?id=126363
+
+ Reviewed by Anders Carlsson.
+
+ Just use childrenOfType<Element>/descendantsOfType<Element> instead. They are not that much longer
+ and consistency is valuable.
+
+ * accessibility/AccessibilityNodeObject.cpp:
+ (WebCore::AccessibilityNodeObject::canvasHasFallbackContent):
+ (WebCore::siblingWithAriaRole):
+ * accessibility/AccessibilityTable.cpp:
+ (WebCore::AccessibilityTable::isDataTable):
+ * css/StyleInvalidationAnalysis.cpp:
+ (WebCore::StyleInvalidationAnalysis::invalidateStyle):
+ * dom/ChildNodeList.cpp:
+ (WebCore::ChildNodeList::namedItem):
+ * dom/Document.cpp:
+ (WebCore::Document::buildAccessKeyMap):
+ (WebCore::Document::childrenChanged):
+ * dom/Element.cpp:
+ (WebCore::Element::resetComputedStyle):
+ * dom/ElementChildIterator.h:
+ * dom/ElementDescendantIterator.h:
+ * dom/SelectorQuery.cpp:
+ (WebCore::elementsForLocalName):
+ (WebCore::anyElement):
+ (WebCore::SelectorDataList::executeSingleTagNameSelectorData):
+ (WebCore::SelectorDataList::executeSingleClassNameSelectorData):
+ (WebCore::SelectorDataList::executeSingleSelectorData):
+ (WebCore::SelectorDataList::executeSingleMultiSelectorData):
+ * editing/ApplyStyleCommand.cpp:
+ (WebCore::ApplyStyleCommand::cleanupUnstyledAppleStyleSpans):
+ * editing/ReplaceSelectionCommand.cpp:
+ (WebCore::removeHeadContents):
+ * editing/markup.cpp:
+ (WebCore::completeURLs):
+ * html/HTMLFieldSetElement.cpp:
+ (WebCore::HTMLFieldSetElement::refreshElementsIfNeeded):
+ * html/HTMLObjectElement.cpp:
+ (WebCore::HTMLObjectElement::containsJavaApplet):
+ * loader/PlaceholderDocument.cpp:
+ (WebCore::PlaceholderDocument::createRenderTree):
+ * rendering/RenderChildIterator.h:
+ * svg/SVGSVGElement.cpp:
+ (WebCore::SVGSVGElement::getElementById):
+ * svg/SVGUseElement.cpp:
+ (WebCore::subtreeContainsDisallowedElement):
+ (WebCore::removeDisallowedElementsFromSubtree):
+
+2014-01-01 Antti Koivisto <antti@apple.com>
+
</ins><span class="cx"> Do less synchronous render tree construction
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=126359
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityNodeObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp (161195 => 161196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2014-01-01 21:20:51 UTC (rev 161195)
+++ trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2014-01-01 21:48:13 UTC (rev 161196)
</span><span class="lines">@@ -439,7 +439,7 @@
</span><span class="cx"> // If it has any children that are elements, we'll assume it might be fallback
</span><span class="cx"> // content. If it has no children or its only children are not elements
</span><span class="cx"> // (e.g. just text nodes), it doesn't have fallback content.
</span><del>- return elementChildren(canvasElement).first();
</del><ins>+ return childrenOfType<Element>(canvasElement).first();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool AccessibilityNodeObject::isImageButton() const
</span><span class="lines">@@ -1183,7 +1183,7 @@
</span><span class="cx"> if (!parent)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- for (auto& sibling : elementChildren(*parent)) {
</del><ins>+ for (auto& sibling : childrenOfType<Element>(*parent)) {
</ins><span class="cx"> const AtomicString& siblingAriaRole = sibling.fastGetAttribute(roleAttr);
</span><span class="cx"> if (equalIgnoringCase(siblingAriaRole, role))
</span><span class="cx"> return &sibling;
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityTablecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityTable.cpp (161195 => 161196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityTable.cpp 2014-01-01 21:20:51 UTC (rev 161195)
+++ trunk/Source/WebCore/accessibility/AccessibilityTable.cpp 2014-01-01 21:48:13 UTC (rev 161196)
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> // if there's a colgroup or col element, it's probably a data table.
</span><del>- for (auto& child : elementChildren(*tableElement)) {
</del><ins>+ for (auto& child : childrenOfType<Element>(*tableElement)) {
</ins><span class="cx"> if (child.hasTagName(colTag) || child.hasTagName(colgroupTag))
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleInvalidationAnalysiscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleInvalidationAnalysis.cpp (161195 => 161196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleInvalidationAnalysis.cpp 2014-01-01 21:20:51 UTC (rev 161195)
+++ trunk/Source/WebCore/css/StyleInvalidationAnalysis.cpp 2014-01-01 21:48:13 UTC (rev 161196)
</span><span class="lines">@@ -118,8 +118,8 @@
</span><span class="cx"> if (m_idScopes.isEmpty() && m_classScopes.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- auto it = elementDescendants(document).begin();
- auto end = elementDescendants(document).end();
</del><ins>+ auto it = descendantsOfType<Element>(document).begin();
+ auto end = descendantsOfType<Element>(document).end();
</ins><span class="cx"> while (it != end) {
</span><span class="cx"> if (elementMatchesSelectorScopes(*it, m_idScopes, m_classScopes)) {
</span><span class="cx"> it->setNeedsStyleRecalc();
</span></span></pre></div>
<a id="trunkSourceWebCoredomChildNodeListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ChildNodeList.cpp (161195 => 161196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ChildNodeList.cpp 2014-01-01 21:20:51 UTC (rev 161195)
+++ trunk/Source/WebCore/dom/ChildNodeList.cpp 2014-01-01 21:48:13 UTC (rev 161196)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> if (!element || !m_parent.get().treeScope().containsMultipleElementsWithId(name))
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><del>- for (auto& element : elementChildren(m_parent.get())) {
</del><ins>+ for (auto& element : childrenOfType<Element>(m_parent.get())) {
</ins><span class="cx"> if (element.hasID() && element.idForStyleResolution() == name)
</span><span class="cx"> return const_cast<Element*>(&element);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (161195 => 161196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2014-01-01 21:20:51 UTC (rev 161195)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-01-01 21:48:13 UTC (rev 161196)
</span><span class="lines">@@ -686,7 +686,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(scope);
</span><span class="cx"> ContainerNode* rootNode = scope->rootNode();
</span><del>- for (auto& element : elementDescendants(*rootNode)) {
</del><ins>+ for (auto& element : descendantsOfType<Element>(*rootNode)) {
</ins><span class="cx"> const AtomicString& accessKey = element.fastGetAttribute(accesskeyAttr);
</span><span class="cx"> if (!accessKey.isEmpty())
</span><span class="cx"> m_elementsByAccessKey.set(accessKey.impl(), &element);
</span><span class="lines">@@ -806,7 +806,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- Element* newDocumentElement = elementChildren(*this).first();
</del><ins>+ Element* newDocumentElement = childrenOfType<Element>(*this).first();
</ins><span class="cx">
</span><span class="cx"> if (newDocumentElement == m_documentElement)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (161195 => 161196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2014-01-01 21:20:51 UTC (rev 161195)
+++ trunk/Source/WebCore/dom/Element.cpp 2014-01-01 21:48:13 UTC (rev 161196)
</span><span class="lines">@@ -2930,7 +2930,7 @@
</span><span class="cx"> if (!hasRareData() || !elementRareData()->computedStyle())
</span><span class="cx"> return;
</span><span class="cx"> elementRareData()->resetComputedStyle();
</span><del>- for (auto& child : elementDescendants(*this)) {
</del><ins>+ for (auto& child : descendantsOfType<Element>(*this)) {
</ins><span class="cx"> if (child.hasRareData())
</span><span class="cx"> child.elementRareData()->resetComputedStyle();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementChildIteratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ElementChildIterator.h (161195 => 161196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ElementChildIterator.h 2014-01-01 21:20:51 UTC (rev 161195)
+++ trunk/Source/WebCore/dom/ElementChildIterator.h 2014-01-01 21:48:13 UTC (rev 161196)
</span><span class="lines">@@ -72,8 +72,6 @@
</span><span class="cx"> const ContainerNode& m_parent;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-ElementChildIteratorAdapter<Element> elementChildren(ContainerNode&);
-ElementChildConstIteratorAdapter<Element> elementChildren(const ContainerNode&);
</del><span class="cx"> template <typename ElementType> ElementChildIteratorAdapter<ElementType> childrenOfType(ContainerNode&);
</span><span class="cx"> template <typename ElementType> ElementChildConstIteratorAdapter<ElementType> childrenOfType(const ContainerNode&);
</span><span class="cx">
</span><span class="lines">@@ -183,22 +181,12 @@
</span><span class="cx">
</span><span class="cx"> // Standalone functions
</span><span class="cx">
</span><del>-inline ElementChildIteratorAdapter<Element> elementChildren(ContainerNode& parent)
-{
- return ElementChildIteratorAdapter<Element>(parent);
-}
-
</del><span class="cx"> template <typename ElementType>
</span><span class="cx"> inline ElementChildIteratorAdapter<ElementType> childrenOfType(ContainerNode& parent)
</span><span class="cx"> {
</span><span class="cx"> return ElementChildIteratorAdapter<ElementType>(parent);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline ElementChildConstIteratorAdapter<Element> elementChildren(const ContainerNode& parent)
-{
- return ElementChildConstIteratorAdapter<Element>(parent);
-}
-
</del><span class="cx"> template <typename ElementType>
</span><span class="cx"> inline ElementChildConstIteratorAdapter<ElementType> childrenOfType(const ContainerNode& parent)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementDescendantIteratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ElementDescendantIterator.h (161195 => 161196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ElementDescendantIterator.h 2014-01-01 21:20:51 UTC (rev 161195)
+++ trunk/Source/WebCore/dom/ElementDescendantIterator.h 2014-01-01 21:48:13 UTC (rev 161196)
</span><span class="lines">@@ -78,8 +78,6 @@
</span><span class="cx"> const ContainerNode& m_root;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-ElementDescendantIteratorAdapter<Element> elementDescendants(ContainerNode&);
-ElementDescendantConstIteratorAdapter<Element> elementDescendants(const ContainerNode&);
</del><span class="cx"> template <typename ElementType> ElementDescendantIteratorAdapter<ElementType> descendantsOfType(ContainerNode&);
</span><span class="cx"> template <typename ElementType> ElementDescendantConstIteratorAdapter<ElementType> descendantsOfType(const ContainerNode&);
</span><span class="cx">
</span><span class="lines">@@ -230,22 +228,12 @@
</span><span class="cx">
</span><span class="cx"> // Standalone functions
</span><span class="cx">
</span><del>-inline ElementDescendantIteratorAdapter<Element> elementDescendants(ContainerNode& root)
-{
- return ElementDescendantIteratorAdapter<Element>(root);
-}
-
</del><span class="cx"> template <typename ElementType>
</span><span class="cx"> inline ElementDescendantIteratorAdapter<ElementType> descendantsOfType(ContainerNode& root)
</span><span class="cx"> {
</span><span class="cx"> return ElementDescendantIteratorAdapter<ElementType>(root);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline ElementDescendantConstIteratorAdapter<Element> elementDescendants(const ContainerNode& root)
-{
- return ElementDescendantConstIteratorAdapter<Element>(root);
-}
-
</del><span class="cx"> template <typename ElementType>
</span><span class="cx"> inline ElementDescendantConstIteratorAdapter<ElementType> descendantsOfType(const ContainerNode& root)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoredomSelectorQuerycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/SelectorQuery.cpp (161195 => 161196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/SelectorQuery.cpp 2014-01-01 21:20:51 UTC (rev 161195)
+++ trunk/Source/WebCore/dom/SelectorQuery.cpp 2014-01-01 21:48:13 UTC (rev 161196)
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> template <typename SelectorQueryTrait>
</span><span class="cx"> static inline void elementsForLocalName(const ContainerNode& rootNode, const AtomicString& localName, typename SelectorQueryTrait::OutputType& output)
</span><span class="cx"> {
</span><del>- for (auto& element : elementDescendants(const_cast<ContainerNode&>(rootNode))) {
</del><ins>+ for (auto& element : descendantsOfType<Element>(const_cast<ContainerNode&>(rootNode))) {
</ins><span class="cx"> if (element.tagQName().localName() == localName) {
</span><span class="cx"> SelectorQueryTrait::appendOutputForElement(output, &element);
</span><span class="cx"> if (SelectorQueryTrait::shouldOnlyMatchFirstElement)
</span><span class="lines">@@ -177,7 +177,7 @@
</span><span class="cx"> template <typename SelectorQueryTrait>
</span><span class="cx"> static inline void anyElement(const ContainerNode& rootNode, typename SelectorQueryTrait::OutputType& output)
</span><span class="cx"> {
</span><del>- for (auto& element : elementDescendants(const_cast<ContainerNode&>(rootNode))) {
</del><ins>+ for (auto& element : descendantsOfType<Element>(const_cast<ContainerNode&>(rootNode))) {
</ins><span class="cx"> SelectorQueryTrait::appendOutputForElement(output, &element);
</span><span class="cx"> if (SelectorQueryTrait::shouldOnlyMatchFirstElement)
</span><span class="cx"> return;
</span><span class="lines">@@ -205,7 +205,7 @@
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> // Fallback: NamespaceURI is set, selectorLocalName may be starAtom.
</span><del>- for (auto& element : elementDescendants(const_cast<ContainerNode&>(rootNode))) {
</del><ins>+ for (auto& element : descendantsOfType<Element>(const_cast<ContainerNode&>(rootNode))) {
</ins><span class="cx"> if (element.namespaceURI() == selectorNamespaceURI && (selectorLocalName == starAtom || element.tagQName().localName() == selectorLocalName)) {
</span><span class="cx"> SelectorQueryTrait::appendOutputForElement(output, &element);
</span><span class="cx"> if (SelectorQueryTrait::shouldOnlyMatchFirstElement)
</span><span class="lines">@@ -227,7 +227,7 @@
</span><span class="cx"> ASSERT(isSingleClassNameSelector(*selectorData.selector));
</span><span class="cx">
</span><span class="cx"> const AtomicString& className = selectorData.selector->value();
</span><del>- for (auto& element : elementDescendants(const_cast<ContainerNode&>(rootNode))) {
</del><ins>+ for (auto& element : descendantsOfType<Element>(const_cast<ContainerNode&>(rootNode))) {
</ins><span class="cx"> if (element.hasClass() && element.classNames().contains(className)) {
</span><span class="cx"> SelectorQueryTrait::appendOutputForElement(output, &element);
</span><span class="cx"> if (SelectorQueryTrait::shouldOnlyMatchFirstElement)
</span><span class="lines">@@ -241,7 +241,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_selectors.size() == 1);
</span><span class="cx">
</span><del>- for (auto& element : elementDescendants(const_cast<ContainerNode&>(rootNode))) {
</del><ins>+ for (auto& element : descendantsOfType<Element>(const_cast<ContainerNode&>(rootNode))) {
</ins><span class="cx"> if (selectorMatches(selectorData, element, rootNode)) {
</span><span class="cx"> SelectorQueryTrait::appendOutputForElement(output, &element);
</span><span class="cx"> if (SelectorQueryTrait::shouldOnlyMatchFirstElement)
</span><span class="lines">@@ -254,7 +254,7 @@
</span><span class="cx"> ALWAYS_INLINE void SelectorDataList::executeSingleMultiSelectorData(const ContainerNode& rootNode, typename SelectorQueryTrait::OutputType& output) const
</span><span class="cx"> {
</span><span class="cx"> unsigned selectorCount = m_selectors.size();
</span><del>- for (auto& element : elementDescendants(const_cast<ContainerNode&>(rootNode))) {
</del><ins>+ for (auto& element : descendantsOfType<Element>(const_cast<ContainerNode&>(rootNode))) {
</ins><span class="cx"> for (unsigned i = 0; i < selectorCount; ++i) {
</span><span class="cx"> if (selectorMatches(m_selectors[i], element, rootNode)) {
</span><span class="cx"> SelectorQueryTrait::appendOutputForElement(output, &element);
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingApplyStyleCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/ApplyStyleCommand.cpp (161195 => 161196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/ApplyStyleCommand.cpp 2014-01-01 21:20:51 UTC (rev 161195)
+++ trunk/Source/WebCore/editing/ApplyStyleCommand.cpp 2014-01-01 21:48:13 UTC (rev 161196)
</span><span class="lines">@@ -439,7 +439,7 @@
</span><span class="cx"> // all the children of the dummy's parent
</span><span class="cx">
</span><span class="cx"> Vector<Element*> toRemove;
</span><del>- for (auto& child : elementChildren(*dummySpanAncestor)) {
</del><ins>+ for (auto& child : childrenOfType<Element>(*dummySpanAncestor)) {
</ins><span class="cx"> if (isSpanWithoutAttributesOrUnstyledStyleSpan(&child))
</span><span class="cx"> toRemove.append(&child);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingReplaceSelectionCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp (161195 => 161196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp 2014-01-01 21:20:51 UTC (rev 161195)
+++ trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp 2014-01-01 21:48:13 UTC (rev 161196)
</span><span class="lines">@@ -706,8 +706,8 @@
</span><span class="cx">
</span><span class="cx"> Vector<Element*> toRemove;
</span><span class="cx">
</span><del>- auto it = elementDescendants(*fragment.fragment()).begin();
- auto end = elementDescendants(*fragment.fragment()).end();
</del><ins>+ auto it = descendantsOfType<Element>(*fragment.fragment()).begin();
+ auto end = descendantsOfType<Element>(*fragment.fragment()).end();
</ins><span class="cx"> while (it != end) {
</span><span class="cx"> if (it->hasTagName(baseTag) || it->hasTagName(linkTag) || it->hasTagName(metaTag) || it->hasTagName(styleTag) || isHTMLTitleElement(*it)) {
</span><span class="cx"> toRemove.append(&*it);
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingmarkupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/markup.cpp (161195 => 161196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/markup.cpp 2014-01-01 21:20:51 UTC (rev 161195)
+++ trunk/Source/WebCore/editing/markup.cpp 2014-01-01 21:48:13 UTC (rev 161196)
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx">
</span><span class="cx"> URL parsedBaseURL(ParsedURLString, baseURL);
</span><span class="cx">
</span><del>- for (auto& element : elementDescendants(*fragment)) {
</del><ins>+ for (auto& element : descendantsOfType<Element>(*fragment)) {
</ins><span class="cx"> if (!element.hasAttributes())
</span><span class="cx"> continue;
</span><span class="cx"> unsigned length = element.attributeCount();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFieldSetElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFieldSetElement.cpp (161195 => 161196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFieldSetElement.cpp 2014-01-01 21:20:51 UTC (rev 161195)
+++ trunk/Source/WebCore/html/HTMLFieldSetElement.cpp 2014-01-01 21:48:13 UTC (rev 161196)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx">
</span><span class="cx"> m_associatedElements.clear();
</span><span class="cx">
</span><del>- for (auto& element : elementDescendants(const_cast<HTMLFieldSetElement&>(*this))) {
</del><ins>+ for (auto& element : descendantsOfType<Element>(const_cast<HTMLFieldSetElement&>(*this))) {
</ins><span class="cx"> if (element.hasTagName(objectTag))
</span><span class="cx"> m_associatedElements.append(&toHTMLObjectElement(element));
</span><span class="cx"> else if (element.isFormControlElement())
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLObjectElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLObjectElement.cpp (161195 => 161196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLObjectElement.cpp 2014-01-01 21:20:51 UTC (rev 161195)
+++ trunk/Source/WebCore/html/HTMLObjectElement.cpp 2014-01-01 21:48:13 UTC (rev 161196)
</span><span class="lines">@@ -461,7 +461,7 @@
</span><span class="cx"> if (MIMETypeRegistry::isJavaAppletMIMEType(getAttribute(typeAttr)))
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- for (auto& child : elementChildren(*this)) {
</del><ins>+ for (auto& child : childrenOfType<Element>(*this)) {
</ins><span class="cx"> if (child.hasTagName(paramTag) && equalIgnoringCase(child.getNameAttribute(), "type")
</span><span class="cx"> && MIMETypeRegistry::isJavaAppletMIMEType(child.getAttribute(valueAttr).string()))
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderPlaceholderDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/PlaceholderDocument.cpp (161195 => 161196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/PlaceholderDocument.cpp 2014-01-01 21:20:51 UTC (rev 161195)
+++ trunk/Source/WebCore/loader/PlaceholderDocument.cpp 2014-01-01 21:48:13 UTC (rev 161196)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!renderView());
</span><span class="cx">
</span><del>- for (auto& child : elementChildren(*this))
</del><ins>+ for (auto& child : childrenOfType<Element>(*this))
</ins><span class="cx"> Style::attachRenderTree(child);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderChildIteratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderChildIterator.h (161195 => 161196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderChildIterator.h 2014-01-01 21:20:51 UTC (rev 161195)
+++ trunk/Source/WebCore/rendering/RenderChildIterator.h 2014-01-01 21:48:13 UTC (rev 161196)
</span><span class="lines">@@ -72,8 +72,6 @@
</span><span class="cx"> const RenderElement& m_parent;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-RenderChildIteratorAdapter<RenderObject> elementChildren(RenderElement&);
-RenderChildConstIteratorAdapter<RenderObject> elementChildren(const RenderElement&);
</del><span class="cx"> template <typename T> RenderChildIteratorAdapter<T> childrenOfType(RenderElement&);
</span><span class="cx"> template <typename T> RenderChildConstIteratorAdapter<T> childrenOfType(const RenderElement&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGSVGElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGSVGElement.cpp (161195 => 161196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGSVGElement.cpp 2014-01-01 21:20:51 UTC (rev 161195)
+++ trunk/Source/WebCore/svg/SVGSVGElement.cpp 2014-01-01 21:48:13 UTC (rev 161196)
</span><span class="lines">@@ -775,7 +775,7 @@
</span><span class="cx">
</span><span class="cx"> // Fall back to traversing our subtree. Duplicate ids are allowed, the first found will
</span><span class="cx"> // be returned.
</span><del>- for (auto& element : elementDescendants(*this)) {
</del><ins>+ for (auto& element : descendantsOfType<Element>(*this)) {
</ins><span class="cx"> if (element.getIdAttribute() == id)
</span><span class="cx"> return &element;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGUseElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGUseElement.cpp (161195 => 161196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGUseElement.cpp 2014-01-01 21:20:51 UTC (rev 161195)
+++ trunk/Source/WebCore/svg/SVGUseElement.cpp 2014-01-01 21:48:13 UTC (rev 161196)
</span><span class="lines">@@ -365,7 +365,7 @@
</span><span class="cx">
</span><span class="cx"> static bool subtreeContainsDisallowedElement(SVGElement& start)
</span><span class="cx"> {
</span><del>- for (auto& element : elementDescendants(start)) {
</del><ins>+ for (auto& element : descendantsOfType<Element>(start)) {
</ins><span class="cx"> if (isDisallowedElement(element))
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -658,8 +658,8 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!subtree.inDocument());
</span><span class="cx"> Vector<Element*> toRemove;
</span><del>- auto it = elementDescendants(subtree).begin();
- auto end = elementDescendants(subtree).end();
</del><ins>+ auto it = descendantsOfType<Element>(subtree).begin();
+ auto end = descendantsOfType<Element>(subtree).end();
</ins><span class="cx"> while (it != end) {
</span><span class="cx"> if (isDisallowedElement(*it)) {
</span><span class="cx"> toRemove.append(&*it);
</span></span></pre>
</div>
</div>
</body>
</html>