<!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>[196281] 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/196281">196281</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2016-02-08 17:15:52 -0800 (Mon, 08 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Implement ComposedTreeIterator in terms of ElementAndTextDescendantIterator
https://bugs.webkit.org/show_bug.cgi?id=154003
Reviewed by Darin Adler.
Currently ComposedTreeIterator implements tree traversal using NodeTraversal. This makes it overly complicated.
It can also return nodes other than Element and Text which should not be part of the composed tree.
This patch adds a new iterator type, ElementAndTextDescendantIterator, similar to the existing ElementDescendantIterator.
ComposedTreeIterator is then implemented using this new iterator.
When entering a shadow tree or a slot the local iterator is pushed along with the context stack and a new local
iterator is initialized for the new context. When leaving a shadow tree the context stack is popped and the previous
local iterator becomes active.
* WebCore.xcodeproj/project.pbxproj:
* dom/ComposedTreeIterator.cpp:
(WebCore::ComposedTreeIterator::ComposedTreeIterator):
(WebCore::ComposedTreeIterator::initializeContextStack):
(WebCore::ComposedTreeIterator::pushContext):
(WebCore::ComposedTreeIterator::traverseNextInShadowTree):
(WebCore::ComposedTreeIterator::traverseNextLeavingContext):
(WebCore::ComposedTreeIterator::advanceInSlot):
(WebCore::ComposedTreeIterator::traverseSiblingInSlot):
(WebCore::ComposedTreeIterator::initializeShadowStack): Deleted.
(WebCore::ComposedTreeIterator::traverseParentInShadowTree): Deleted.
(WebCore::ComposedTreeIterator::traverseNextSiblingSlot): Deleted.
(WebCore::ComposedTreeIterator::traversePreviousSiblingSlot): Deleted.
* dom/ComposedTreeIterator.h:
(WebCore::ComposedTreeIterator::operator*):
(WebCore::ComposedTreeIterator::operator->):
(WebCore::ComposedTreeIterator::operator==):
(WebCore::ComposedTreeIterator::operator!=):
(WebCore::ComposedTreeIterator::operator++):
(WebCore::ComposedTreeIterator::Context::Context):
(WebCore::ComposedTreeIterator::context):
(WebCore::ComposedTreeIterator::current):
(WebCore::ComposedTreeIterator::ComposedTreeIterator):
(WebCore::ComposedTreeIterator::traverseNext):
(WebCore::ComposedTreeIterator::traverseNextSkippingChildren):
(WebCore::ComposedTreeIterator::traverseNextSibling):
(WebCore::ComposedTreeIterator::traversePreviousSibling):
(WebCore::ComposedTreeDescendantAdapter::ComposedTreeDescendantAdapter):
(WebCore::ComposedTreeDescendantAdapter::begin):
(WebCore::ComposedTreeDescendantAdapter::end):
(WebCore::ComposedTreeDescendantAdapter::at):
(WebCore::ComposedTreeChildAdapter::Iterator::Iterator):
(WebCore::ComposedTreeChildAdapter::ComposedTreeChildAdapter):
(WebCore::ComposedTreeChildAdapter::begin):
(WebCore::ComposedTreeChildAdapter::end):
(WebCore::ComposedTreeChildAdapter::at):
(WebCore::ComposedTreeIterator::ShadowContext::ShadowContext): Deleted.
(WebCore::ComposedTreeIterator::traverseParent): Deleted.
* dom/ElementAndTextDescendantIterator.h: Added.
New iterator type that traverses Element and Text nodes (that is renderable nodes only).
It also tracks depth for future use.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoredomComposedTreeIteratorcpp">trunk/Source/WebCore/dom/ComposedTreeIterator.cpp</a></li>
<li><a href="#trunkSourceWebCoredomComposedTreeIteratorh">trunk/Source/WebCore/dom/ComposedTreeIterator.h</a></li>
<li><a href="#trunkSourceWebCoredomElementIteratorAssertionsh">trunk/Source/WebCore/dom/ElementIteratorAssertions.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoredomElementAndTextDescendantIteratorh">trunk/Source/WebCore/dom/ElementAndTextDescendantIterator.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (196280 => 196281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-09 01:06:23 UTC (rev 196280)
+++ trunk/Source/WebCore/ChangeLog 2016-02-09 01:15:52 UTC (rev 196281)
</span><span class="lines">@@ -1,3 +1,63 @@
</span><ins>+2016-02-08 Antti Koivisto <antti@apple.com>
+
+ Implement ComposedTreeIterator in terms of ElementAndTextDescendantIterator
+ https://bugs.webkit.org/show_bug.cgi?id=154003
+
+ Reviewed by Darin Adler.
+
+ Currently ComposedTreeIterator implements tree traversal using NodeTraversal. This makes it overly complicated.
+ It can also return nodes other than Element and Text which should not be part of the composed tree.
+
+ This patch adds a new iterator type, ElementAndTextDescendantIterator, similar to the existing ElementDescendantIterator.
+ ComposedTreeIterator is then implemented using this new iterator.
+
+ When entering a shadow tree or a slot the local iterator is pushed along with the context stack and a new local
+ iterator is initialized for the new context. When leaving a shadow tree the context stack is popped and the previous
+ local iterator becomes active.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * dom/ComposedTreeIterator.cpp:
+ (WebCore::ComposedTreeIterator::ComposedTreeIterator):
+ (WebCore::ComposedTreeIterator::initializeContextStack):
+ (WebCore::ComposedTreeIterator::pushContext):
+ (WebCore::ComposedTreeIterator::traverseNextInShadowTree):
+ (WebCore::ComposedTreeIterator::traverseNextLeavingContext):
+ (WebCore::ComposedTreeIterator::advanceInSlot):
+ (WebCore::ComposedTreeIterator::traverseSiblingInSlot):
+ (WebCore::ComposedTreeIterator::initializeShadowStack): Deleted.
+ (WebCore::ComposedTreeIterator::traverseParentInShadowTree): Deleted.
+ (WebCore::ComposedTreeIterator::traverseNextSiblingSlot): Deleted.
+ (WebCore::ComposedTreeIterator::traversePreviousSiblingSlot): Deleted.
+ * dom/ComposedTreeIterator.h:
+ (WebCore::ComposedTreeIterator::operator*):
+ (WebCore::ComposedTreeIterator::operator->):
+ (WebCore::ComposedTreeIterator::operator==):
+ (WebCore::ComposedTreeIterator::operator!=):
+ (WebCore::ComposedTreeIterator::operator++):
+ (WebCore::ComposedTreeIterator::Context::Context):
+ (WebCore::ComposedTreeIterator::context):
+ (WebCore::ComposedTreeIterator::current):
+ (WebCore::ComposedTreeIterator::ComposedTreeIterator):
+ (WebCore::ComposedTreeIterator::traverseNext):
+ (WebCore::ComposedTreeIterator::traverseNextSkippingChildren):
+ (WebCore::ComposedTreeIterator::traverseNextSibling):
+ (WebCore::ComposedTreeIterator::traversePreviousSibling):
+ (WebCore::ComposedTreeDescendantAdapter::ComposedTreeDescendantAdapter):
+ (WebCore::ComposedTreeDescendantAdapter::begin):
+ (WebCore::ComposedTreeDescendantAdapter::end):
+ (WebCore::ComposedTreeDescendantAdapter::at):
+ (WebCore::ComposedTreeChildAdapter::Iterator::Iterator):
+ (WebCore::ComposedTreeChildAdapter::ComposedTreeChildAdapter):
+ (WebCore::ComposedTreeChildAdapter::begin):
+ (WebCore::ComposedTreeChildAdapter::end):
+ (WebCore::ComposedTreeChildAdapter::at):
+ (WebCore::ComposedTreeIterator::ShadowContext::ShadowContext): Deleted.
+ (WebCore::ComposedTreeIterator::traverseParent): Deleted.
+ * dom/ElementAndTextDescendantIterator.h: Added.
+
+ New iterator type that traverses Element and Text nodes (that is renderable nodes only).
+ It also tracks depth for future use.
+
</ins><span class="cx"> 2016-02-08 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: copy({x:1}) should copy "{x:1}", not "[object Object]"
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (196280 => 196281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-02-09 01:06:23 UTC (rev 196280)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-02-09 01:15:52 UTC (rev 196281)
</span><span class="lines">@@ -6530,6 +6530,7 @@
</span><span class="cx"> E43A023D17EB3713004CDD25 /* RenderElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E43A023C17EB3713004CDD25 /* RenderElement.cpp */; };
</span><span class="cx"> E43AF8E61AC5B7E800CA717E /* CacheValidation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E43AF8E41AC5B7DD00CA717E /* CacheValidation.cpp */; };
</span><span class="cx"> E43AF8E71AC5B7EC00CA717E /* CacheValidation.h in Headers */ = {isa = PBXBuildFile; fileRef = E43AF8E51AC5B7DD00CA717E /* CacheValidation.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ E440AA961C68420800A265CC /* ElementAndTextDescendantIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = E440AA951C68420800A265CC /* ElementAndTextDescendantIterator.h */; };
</ins><span class="cx"> E44613A10CD6331000FADA75 /* HTMLAudioElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E446138F0CD6331000FADA75 /* HTMLAudioElement.cpp */; };
</span><span class="cx"> E44613A20CD6331000FADA75 /* HTMLAudioElement.h in Headers */ = {isa = PBXBuildFile; fileRef = E44613900CD6331000FADA75 /* HTMLAudioElement.h */; };
</span><span class="cx"> E44613A40CD6331000FADA75 /* HTMLMediaElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E44613920CD6331000FADA75 /* HTMLMediaElement.cpp */; };
</span><span class="lines">@@ -14508,6 +14509,7 @@
</span><span class="cx"> E43A023C17EB3713004CDD25 /* RenderElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderElement.cpp; sourceTree = "<group>"; };
</span><span class="cx"> E43AF8E41AC5B7DD00CA717E /* CacheValidation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CacheValidation.cpp; sourceTree = "<group>"; };
</span><span class="cx"> E43AF8E51AC5B7DD00CA717E /* CacheValidation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CacheValidation.h; sourceTree = "<group>"; };
</span><ins>+ E440AA951C68420800A265CC /* ElementAndTextDescendantIterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ElementAndTextDescendantIterator.h; sourceTree = "<group>"; };
</ins><span class="cx"> E446138F0CD6331000FADA75 /* HTMLAudioElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLAudioElement.cpp; sourceTree = "<group>"; };
</span><span class="cx"> E44613900CD6331000FADA75 /* HTMLAudioElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLAudioElement.h; sourceTree = "<group>"; };
</span><span class="cx"> E44613910CD6331000FADA75 /* HTMLAudioElement.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLAudioElement.idl; sourceTree = "<group>"; };
</span><span class="lines">@@ -24091,6 +24093,7 @@
</span><span class="cx"> A8C4A7F509D563270003AC8D /* Element.h */,
</span><span class="cx"> 93EEC1EA09C2877700C515D1 /* Element.idl */,
</span><span class="cx"> E4AE7C1917D232350009FB31 /* ElementAncestorIterator.h */,
</span><ins>+ E440AA951C68420800A265CC /* ElementAndTextDescendantIterator.h */,
</ins><span class="cx"> E46A2B1D17CA76B1000DBCD8 /* ElementChildIterator.h */,
</span><span class="cx"> B5B7A16F17C1080600E4AA0A /* ElementData.cpp */,
</span><span class="cx"> B5B7A16E17C1048000E4AA0A /* ElementData.h */,
</span><span class="lines">@@ -25850,6 +25853,7 @@
</span><span class="cx"> 93309E0E099E64920056E581 /* FrameSelection.h in Headers */,
</span><span class="cx"> C4CD629B18383766007EBAF1 /* FrameSnapshotting.h in Headers */,
</span><span class="cx"> 65A21485097A3F5300B9050A /* FrameTree.h in Headers */,
</span><ins>+ E440AA961C68420800A265CC /* ElementAndTextDescendantIterator.h in Headers */,
</ins><span class="cx"> 65CBFEFA0974F607001DAC25 /* FrameView.h in Headers */,
</span><span class="cx"> 97205AB0123928CA00B17380 /* FTPDirectoryDocument.h in Headers */,
</span><span class="cx"> 51C81B8A0C4422F70019ECE3 /* FTPDirectoryParser.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCoredomComposedTreeIteratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ComposedTreeIterator.cpp (196280 => 196281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ComposedTreeIterator.cpp 2016-02-09 01:06:23 UTC (rev 196280)
+++ trunk/Source/WebCore/dom/ComposedTreeIterator.cpp 2016-02-09 01:15:52 UTC (rev 196281)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2015 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2015-2016 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">@@ -30,163 +30,153 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-void ComposedTreeIterator::initializeShadowStack()
</del><ins>+ComposedTreeIterator::ComposedTreeIterator(ContainerNode& root)
</ins><span class="cx"> {
</span><ins>+ ASSERT(!is<ShadowRoot>(root));
+
+#if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
+ if (is<HTMLSlotElement>(root)) {
+ auto& slot = downcast<HTMLSlotElement>(root);
+ if (auto* assignedNodes = slot.assignedNodes()) {
+ initializeContextStack(root, *assignedNodes->at(0));
+ return;
+ }
+ }
+#endif
+ auto& effectiveRoot = root.shadowRoot() ? *root.shadowRoot() : root;
+ m_contextStack.uncheckedAppend(Context(effectiveRoot));
+}
+
+ComposedTreeIterator::ComposedTreeIterator(ContainerNode& root, Node& current)
+{
+ ASSERT(!is<ShadowRoot>(root));
+ ASSERT(!is<ShadowRoot>(current));
+
+ bool mayNeedShadowStack = root.shadowRoot() || (&current != &root && current.parentNode() != &root);
+ if (mayNeedShadowStack)
+ initializeContextStack(root, current);
+ else
+ m_contextStack.uncheckedAppend(Context(root, current));
+}
+
+void ComposedTreeIterator::initializeContextStack(ContainerNode& root, Node& current)
+{
</ins><span class="cx"> // This code sets up the iterator for arbitrary node/root pair. It is not needed in common cases
</span><span class="cx"> // or completes fast because node and root are close (like in composedTreeChildren(*parent).at(node) case).
</span><del>- auto* node = m_current;
- while (node != &m_root) {
</del><ins>+ auto* node = &current;
+ auto* contextCurrent = node;
+ size_t currentSlotNodeIndex = notFound;
+ while (node != &root) {
</ins><span class="cx"> auto* parent = node->parentNode();
</span><span class="cx"> if (!parent) {
</span><del>- m_current = nullptr;
</del><ins>+ *this = { };
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> if (is<ShadowRoot>(*parent)) {
</span><span class="cx"> auto& shadowRoot = downcast<ShadowRoot>(*parent);
</span><del>- if (m_shadowStack.isEmpty() || m_shadowStack.last().host != shadowRoot.host())
- m_shadowStack.append(shadowRoot.host());
</del><ins>+ m_contextStack.append(Context(shadowRoot, *contextCurrent, currentSlotNodeIndex));
</ins><span class="cx"> node = shadowRoot.host();
</span><ins>+ contextCurrent = node;
+ currentSlotNodeIndex = notFound;
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx"> if (auto* shadowRoot = parent->shadowRoot()) {
</span><span class="cx"> #if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
</span><del>- m_shadowStack.append(shadowRoot->host());
</del><ins>+ m_contextStack.append(Context(*parent, *contextCurrent, currentSlotNodeIndex));
</ins><span class="cx"> auto* assignedSlot = shadowRoot->findAssignedSlot(*node);
</span><span class="cx"> if (assignedSlot) {
</span><del>- size_t index = assignedSlot->assignedNodes()->find(node);
- ASSERT(index != notFound);
-
- m_shadowStack.last().currentSlot = assignedSlot;
- m_shadowStack.last().currentSlotNodeIndex = index;
</del><ins>+ currentSlotNodeIndex = assignedSlot->assignedNodes()->find(node);
+ ASSERT(currentSlotNodeIndex != notFound);
</ins><span class="cx"> node = assignedSlot;
</span><ins>+ contextCurrent = assignedSlot;
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx"> // The node is not part of the composed tree.
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(shadowRoot);
</span><del>- m_current = nullptr;
- return;
</del><span class="cx"> #endif
</span><ins>+ *this = { };
+ return;
</ins><span class="cx"> }
</span><span class="cx"> node = parent;
</span><span class="cx"> }
</span><del>- m_shadowStack.reverse();
</del><ins>+ m_contextStack.append(Context(root, *contextCurrent, currentSlotNodeIndex));
+
+ m_contextStack.reverse();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+bool ComposedTreeIterator::pushContext(ShadowRoot& shadowRoot)
+{
+ Context shadowContext(shadowRoot);
+ if (!shadowContext.iterator)
+ return false;
+ m_contextStack.append(WTFMove(shadowContext));
+ return true;
+}
+
</ins><span class="cx"> void ComposedTreeIterator::traverseNextInShadowTree()
</span><span class="cx"> {
</span><del>- ASSERT(!m_shadowStack.isEmpty());
</del><ins>+ ASSERT(m_contextStack.size() > 1);
</ins><span class="cx">
</span><del>- auto* shadowContext = &m_shadowStack.last();
-
</del><span class="cx"> #if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
</span><del>- if (is<HTMLSlotElement>(*m_current) && !shadowContext->currentSlot) {
- auto& slot = downcast<HTMLSlotElement>(*m_current);
</del><ins>+ if (is<HTMLSlotElement>(current())) {
+ auto& slot = downcast<HTMLSlotElement>(current());
</ins><span class="cx"> if (auto* assignedNodes = slot.assignedNodes()) {
</span><del>- shadowContext->currentSlot = &slot;
- shadowContext->currentSlotNodeIndex = 0;
- m_current = assignedNodes->at(0);
</del><ins>+ context().slotNodeIndex = 0;
+ auto* assignedNode = assignedNodes->at(0);
+ m_contextStack.append(Context(*assignedNode->parentElement(), *assignedNode));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- m_current = NodeTraversal::next(*m_current, shadowContext->host);
</del><ins>+ context().iterator.traverseNext();
</ins><span class="cx">
</span><del>- while (!m_current) {
-#if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
- if (auto* slot = shadowContext->currentSlot) {
- bool nextNodeInSameSlot = ++shadowContext->currentSlotNodeIndex < slot->assignedNodes()->size();
- if (nextNodeInSameSlot) {
- m_current = slot->assignedNodes()->at(shadowContext->currentSlotNodeIndex);
- return;
- }
- m_current = NodeTraversal::nextSkippingChildren(*slot, shadowContext->host);
- shadowContext->currentSlot = nullptr;
- continue;
- }
-#endif
- auto& previousHost = *shadowContext->host;
- m_shadowStack.removeLast();
-
- if (m_shadowStack.isEmpty()) {
- m_current = NodeTraversal::nextSkippingChildren(previousHost, &m_root);
- return;
- }
- shadowContext = &m_shadowStack.last();
- m_current = NodeTraversal::nextSkippingChildren(previousHost, shadowContext->host);
- }
</del><ins>+ if (!context().iterator)
+ traverseNextLeavingContext();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ComposedTreeIterator::traverseParentInShadowTree()
</del><ins>+void ComposedTreeIterator::traverseNextLeavingContext()
</ins><span class="cx"> {
</span><del>- ASSERT(!m_shadowStack.isEmpty());
</del><ins>+ ASSERT(m_contextStack.size() > 1);
</ins><span class="cx">
</span><del>- auto& shadowContext = m_shadowStack.last();
-
- auto* parent = m_current->parentNode();
- if (is<ShadowRoot>(parent)) {
- ASSERT(shadowContext.host == downcast<ShadowRoot>(*parent).host());
-
- m_current = shadowContext.host;
- m_shadowStack.removeLast();
- return;
- }
- if (parent->shadowRoot()) {
</del><ins>+ while (!context().iterator && m_contextStack.size() > 1) {
+ m_contextStack.removeLast();
+ if (!context().iterator)
+ return;
</ins><span class="cx"> #if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
</span><del>- ASSERT(shadowContext.host == parent);
-
- auto* slot = shadowContext.currentSlot;
- ASSERT(slot->assignedNodes()->at(shadowContext.currentSlotNodeIndex) == m_current);
-
- m_current = slot;
- shadowContext.currentSlot = nullptr;
- return;
-#else
- m_current = nullptr;
- return;
</del><ins>+ if (is<HTMLSlotElement>(current()) && advanceInSlot(1))
+ return;
</ins><span class="cx"> #endif
</span><ins>+ context().iterator.traverseNextSkippingChildren();
</ins><span class="cx"> }
</span><del>- m_current = parent;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
</span><del>-void ComposedTreeIterator::traverseNextSiblingSlot()
</del><ins>+bool ComposedTreeIterator::advanceInSlot(int direction)
</ins><span class="cx"> {
</span><del>- ASSERT(m_current->parentNode()->shadowRoot());
- ASSERT(!m_shadowStack.isEmpty());
- ASSERT(m_shadowStack.last().host == m_current->parentNode());
</del><ins>+ ASSERT(context().slotNodeIndex != notFound);
</ins><span class="cx">
</span><del>- auto& shadowContext = m_shadowStack.last();
</del><ins>+ auto& assignedNodes = *downcast<HTMLSlotElement>(current()).assignedNodes();
+ // It is fine to underflow this.
+ context().slotNodeIndex += direction;
+ if (context().slotNodeIndex >= assignedNodes.size())
+ return false;
</ins><span class="cx">
</span><del>- if (!shadowContext.currentSlot) {
- m_current = nullptr;
- return;
- }
- auto* slotNodes = shadowContext.currentSlot->assignedNodes();
- ASSERT(slotNodes->at(shadowContext.currentSlotNodeIndex) == m_current);
-
- bool nextNodeInSameSlot = ++shadowContext.currentSlotNodeIndex < slotNodes->size();
- m_current = nextNodeInSameSlot ? slotNodes->at(shadowContext.currentSlotNodeIndex) : nullptr;
</del><ins>+ auto* slotNode = assignedNodes.at(context().slotNodeIndex);
+ m_contextStack.append(Context(*slotNode->parentElement(), *slotNode));
+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ComposedTreeIterator::traversePreviousSiblingSlot()
</del><ins>+void ComposedTreeIterator::traverseSiblingInSlot(int direction)
</ins><span class="cx"> {
</span><del>- ASSERT(m_current->parentNode()->shadowRoot());
- ASSERT(!m_shadowStack.isEmpty());
- ASSERT(m_shadowStack.last().host == m_current->parentNode());
</del><ins>+ ASSERT(m_contextStack.size() > 1);
+ ASSERT(current().parentNode()->shadowRoot());
</ins><span class="cx">
</span><del>- auto& shadowContext = m_shadowStack.last();
</del><ins>+ m_contextStack.removeLast();
</ins><span class="cx">
</span><del>- if (!shadowContext.currentSlot) {
- m_current = nullptr;
- return;
- }
- auto* slotNodes = shadowContext.currentSlot->assignedNodes();
- ASSERT(slotNodes->at(shadowContext.currentSlotNodeIndex) == m_current);
-
- bool previousNodeInSameSlot = shadowContext.currentSlotNodeIndex > 0;
- m_current = previousNodeInSameSlot ? slotNodes->at(--shadowContext.currentSlotNodeIndex) : nullptr;
</del><ins>+ if (!advanceInSlot(direction))
+ *this = { };
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomComposedTreeIteratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ComposedTreeIterator.h (196280 => 196281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ComposedTreeIterator.h 2016-02-09 01:06:23 UTC (rev 196280)
+++ trunk/Source/WebCore/dom/ComposedTreeIterator.h 2016-02-09 01:15:52 UTC (rev 196281)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2015 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2015-2016 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">@@ -23,7 +23,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#include "NodeTraversal.h"
</del><ins>+#include "ElementAndTextDescendantIterator.h"
</ins><span class="cx"> #include "ShadowRoot.h"
</span><span class="cx">
</span><span class="cx"> #ifndef ComposedTreeIterator_h
</span><span class="lines">@@ -35,115 +35,118 @@
</span><span class="cx">
</span><span class="cx"> class ComposedTreeIterator {
</span><span class="cx"> public:
</span><ins>+ ComposedTreeIterator();
</ins><span class="cx"> ComposedTreeIterator(ContainerNode& root);
</span><span class="cx"> ComposedTreeIterator(ContainerNode& root, Node& current);
</span><span class="cx">
</span><del>- Node& operator*() { return *m_current; }
- Node* operator->() { return m_current; }
</del><ins>+ Node& operator*() { return current(); }
+ Node* operator->() { return &current(); }
</ins><span class="cx">
</span><del>- bool operator==(const ComposedTreeIterator& other) const { return m_current == other.m_current; }
- bool operator!=(const ComposedTreeIterator& other) const { return m_current != other.m_current; }
</del><ins>+ bool operator==(const ComposedTreeIterator& other) const { return context().iterator == other.context().iterator; }
+ bool operator!=(const ComposedTreeIterator& other) const { return context().iterator != other.context().iterator; }
</ins><span class="cx">
</span><del>- ComposedTreeIterator& operator++() { return traverseNextSibling(); }
</del><ins>+ ComposedTreeIterator& operator++() { return traverseNext(); }
</ins><span class="cx">
</span><span class="cx"> ComposedTreeIterator& traverseNext();
</span><ins>+ ComposedTreeIterator& traverseNextSkippingChildren();
</ins><span class="cx"> ComposedTreeIterator& traverseNextSibling();
</span><span class="cx"> ComposedTreeIterator& traversePreviousSibling();
</span><del>- ComposedTreeIterator& traverseParent();
</del><span class="cx">
</span><ins>+ unsigned depth() const;
+
</ins><span class="cx"> private:
</span><del>- void initializeShadowStack();
</del><ins>+ void initializeContextStack(ContainerNode& root, Node& current);
</ins><span class="cx"> void traverseNextInShadowTree();
</span><del>- void traverseParentInShadowTree();
</del><ins>+ void traverseNextLeavingContext();
+ bool pushContext(ShadowRoot&);
</ins><span class="cx"> #if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
</span><del>- void traverseNextSiblingSlot();
- void traversePreviousSiblingSlot();
</del><ins>+ bool advanceInSlot(int direction);
+ void traverseSiblingInSlot(int direction);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- ContainerNode& m_root;
- Node* m_current { 0 };
-
- struct ShadowContext {
- ShadowContext(Element* host)
- : host(host)
</del><ins>+ struct Context {
+ Context() { }
+ explicit Context(ContainerNode& root)
+ : iterator(root)
</ins><span class="cx"> { }
</span><ins>+ Context(ContainerNode& root, Node& node, size_t slotNodeIndex = notFound)
+ : iterator(root, &node)
+ , slotNodeIndex(slotNodeIndex)
+ { }
</ins><span class="cx">
</span><del>- Element* host;
</del><ins>+ ElementAndTextDescendantIterator iterator;
</ins><span class="cx"> #if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
</span><del>- HTMLSlotElement* currentSlot { nullptr };
- unsigned currentSlotNodeIndex { 0 };
</del><ins>+ size_t slotNodeIndex { notFound };
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><del>- Vector<ShadowContext, 4> m_shadowStack;
</del><ins>+ Context& context() { return m_contextStack.last(); }
+ const Context& context() const { return m_contextStack.last(); }
+ Node& current() { return *context().iterator; }
+
+ Vector<Context, 4> m_contextStack;
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-inline ComposedTreeIterator::ComposedTreeIterator(ContainerNode& root)
- : m_root(root)
</del><ins>+inline ComposedTreeIterator::ComposedTreeIterator()
+ : m_contextStack({ { } })
</ins><span class="cx"> {
</span><del>- ASSERT(!is<ShadowRoot>(m_root));
</del><span class="cx"> }
</span><span class="cx">
</span><del>-inline ComposedTreeIterator::ComposedTreeIterator(ContainerNode& root, Node& current)
- : m_root(root)
- , m_current(&current)
-{
- ASSERT(!is<ShadowRoot>(m_root));
- ASSERT(!is<ShadowRoot>(m_current));
-
- bool mayNeedShadowStack = m_root.shadowRoot() || (m_current != &m_root && current.parentNode() != &m_root);
- if (mayNeedShadowStack)
- initializeShadowStack();
-}
-
</del><span class="cx"> inline ComposedTreeIterator& ComposedTreeIterator::traverseNext()
</span><span class="cx"> {
</span><del>- if (auto* shadowRoot = m_current->shadowRoot()) {
- m_shadowStack.append(shadowRoot->host());
- m_current = shadowRoot;
</del><ins>+ if (auto* shadowRoot = context().iterator->shadowRoot()) {
+ if (pushContext(*shadowRoot))
+ return *this;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_shadowStack.isEmpty())
- m_current = NodeTraversal::next(*m_current, &m_root);
- else
</del><ins>+ if (m_contextStack.size() > 1) {
</ins><span class="cx"> traverseNextInShadowTree();
</span><ins>+ return *this;
+ }
</ins><span class="cx">
</span><ins>+ context().iterator.traverseNext();
</ins><span class="cx"> return *this;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline ComposedTreeIterator& ComposedTreeIterator::traverseNextSkippingChildren()
+{
+ context().iterator.traverseNextSkippingChildren();
+
+ if (!context().iterator && m_contextStack.size() > 1)
+ traverseNextLeavingContext();
+
+ return *this;
+}
+
</ins><span class="cx"> inline ComposedTreeIterator& ComposedTreeIterator::traverseNextSibling()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
</span><del>- bool isAssignedToSlot = !m_shadowStack.isEmpty() && m_current->parentNode()->shadowRoot();
- if (isAssignedToSlot) {
- traverseNextSiblingSlot();
</del><ins>+ if (current().parentNode()->shadowRoot()) {
+ traverseSiblingInSlot(1);
</ins><span class="cx"> return *this;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><del>- m_current = m_current->nextSibling();
</del><ins>+ context().iterator.traverseNextSibling();
</ins><span class="cx"> return *this;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline ComposedTreeIterator& ComposedTreeIterator::traversePreviousSibling()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
</span><del>- bool isAssignedToSlot = !m_shadowStack.isEmpty() && m_current->parentNode()->shadowRoot();
- if (isAssignedToSlot) {
- traversePreviousSiblingSlot();
</del><ins>+ if (current().parentNode()->shadowRoot()) {
+ traverseSiblingInSlot(-1);
</ins><span class="cx"> return *this;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><del>- m_current = m_current->previousSibling();
</del><ins>+ context().iterator.traversePreviousSibling();
</ins><span class="cx"> return *this;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline ComposedTreeIterator& ComposedTreeIterator::traverseParent()
</del><ins>+inline unsigned ComposedTreeIterator::depth() const
</ins><span class="cx"> {
</span><del>- if (m_shadowStack.isEmpty())
- m_current = m_current->parentNode();
- else
- traverseParentInShadowTree();
-
- return *this;
</del><ins>+ unsigned depth = 0;
+ for (auto& context : m_contextStack)
+ depth += context.iterator.depth();
+ return depth;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class ComposedTreeDescendantAdapter {
</span><span class="lines">@@ -152,8 +155,8 @@
</span><span class="cx"> : m_parent(parent)
</span><span class="cx"> { }
</span><span class="cx">
</span><del>- ComposedTreeIterator begin() { return ComposedTreeIterator(m_parent, m_parent).traverseNext(); }
- ComposedTreeIterator end() { return ComposedTreeIterator(m_parent); }
</del><ins>+ ComposedTreeIterator begin() { return ComposedTreeIterator(m_parent); }
+ ComposedTreeIterator end() { return { }; }
</ins><span class="cx"> ComposedTreeIterator at(const Node& child) { return ComposedTreeIterator(m_parent, const_cast<Node&>(child)); }
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -164,7 +167,8 @@
</span><span class="cx"> public:
</span><span class="cx"> class Iterator : public ComposedTreeIterator {
</span><span class="cx"> public:
</span><del>- Iterator(ContainerNode& root)
</del><ins>+ Iterator() = default;
+ explicit Iterator(ContainerNode& root)
</ins><span class="cx"> : ComposedTreeIterator(root)
</span><span class="cx"> { }
</span><span class="cx"> Iterator(ContainerNode& root, Node& current)
</span><span class="lines">@@ -179,8 +183,8 @@
</span><span class="cx"> : m_parent(parent)
</span><span class="cx"> { }
</span><span class="cx">
</span><del>- Iterator begin() { return static_cast<Iterator&>(Iterator(m_parent, m_parent).traverseNext()); }
- Iterator end() { return Iterator(m_parent); }
</del><ins>+ Iterator begin() { return Iterator(m_parent); }
+ Iterator end() { return { }; }
</ins><span class="cx"> Iterator at(const Node& child) { return Iterator(m_parent, const_cast<Node&>(child)); }
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementAndTextDescendantIteratorh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/dom/ElementAndTextDescendantIterator.h (0 => 196281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ElementAndTextDescendantIterator.h (rev 0)
+++ trunk/Source/WebCore/dom/ElementAndTextDescendantIterator.h 2016-02-09 01:15:52 UTC (rev 196281)
</span><span class="lines">@@ -0,0 +1,320 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef ElementAndTextDescendantIterator_h
+#define ElementAndTextDescendantIterator_h
+
+#include "Element.h"
+#include "ElementIteratorAssertions.h"
+#include "Text.h"
+#include <wtf/Vector.h>
+
+namespace WebCore {
+
+class ElementAndTextDescendantIterator {
+public:
+ ElementAndTextDescendantIterator();
+ explicit ElementAndTextDescendantIterator(ContainerNode& root);
+ ElementAndTextDescendantIterator(ContainerNode& root, Node* current);
+
+ ElementAndTextDescendantIterator& operator++() { return traverseNext(); }
+
+ Node& operator*();
+ Node* operator->();
+ const Node& operator*() const;
+ const Node* operator->() const;
+
+ bool operator==(const ElementAndTextDescendantIterator& other) const;
+ bool operator!=(const ElementAndTextDescendantIterator& other) const;
+
+ bool operator!() const { return !m_current; }
+ explicit operator bool() const { return m_current; }
+
+ void dropAssertions();
+
+ ElementAndTextDescendantIterator& traverseNext();
+ ElementAndTextDescendantIterator& traverseNextSkippingChildren();
+ ElementAndTextDescendantIterator& traverseNextSibling();
+ ElementAndTextDescendantIterator& traversePreviousSibling();
+
+ unsigned depth() const { return m_depth; }
+
+private:
+ static bool isElementOrText(const Node& node) { return is<Element>(node) || is<Text>(node); }
+ static Node* firstChild(Node&);
+ static Node* nextSibling(Node&);
+ static Node* previousSibling(Node&);
+
+ void popAncestorSiblingStack();
+
+ Node* m_current;
+ struct AncestorSibling {
+ Node* node;
+ unsigned depth;
+ };
+ Vector<AncestorSibling, 16> m_ancestorSiblingStack;
+ unsigned m_depth { 0 };
+
+#if !ASSERT_DISABLED
+ ElementIteratorAssertions m_assertions;
+#endif
+};
+
+class ElementAndTextDescendantIteratorAdapter {
+public:
+ explicit ElementAndTextDescendantIteratorAdapter(ContainerNode& root);
+ ElementAndTextDescendantIterator begin();
+ ElementAndTextDescendantIterator end();
+
+private:
+ ContainerNode& m_root;
+};
+
+ElementAndTextDescendantIteratorAdapter elementAndTextDescendants(ContainerNode&);
+
+// ElementAndTextDescendantIterator
+
+inline ElementAndTextDescendantIterator::ElementAndTextDescendantIterator()
+ : m_current(nullptr)
+{
+}
+
+inline ElementAndTextDescendantIterator::ElementAndTextDescendantIterator(ContainerNode& root)
+ : m_current(firstChild(root))
+#if !ASSERT_DISABLED
+ , m_assertions(m_current)
+#endif
+{
+ if (!m_current)
+ return;
+ m_ancestorSiblingStack.uncheckedAppend({ nullptr, 0 });
+ m_depth = 1;
+}
+
+inline ElementAndTextDescendantIterator::ElementAndTextDescendantIterator(ContainerNode& root, Node* current)
+ : m_current(current != &root ? current : nullptr)
+#if !ASSERT_DISABLED
+ , m_assertions(m_current)
+#endif
+{
+ if (!m_current)
+ return;
+ ASSERT(isElementOrText(*m_current));
+
+ Vector<Node*, 20> ancestorStack;
+ auto* ancestor = m_current->parentNode();
+ while (ancestor != &root) {
+ ancestorStack.append(ancestor);
+ ancestor = ancestor->parentNode();
+ }
+
+ m_ancestorSiblingStack.uncheckedAppend({ nullptr, 0 });
+ for (unsigned i = ancestorStack.size(); i; --i) {
+ if (auto* sibling = nextSibling(*ancestorStack[i - 1]))
+ m_ancestorSiblingStack.append({ sibling, i });
+ }
+
+ m_depth = ancestorStack.size() + 1;
+}
+
+inline void ElementAndTextDescendantIterator::dropAssertions()
+{
+#if !ASSERT_DISABLED
+ m_assertions.clear();
+#endif
+}
+
+inline Node* ElementAndTextDescendantIterator::firstChild(Node& current)
+{
+ auto* node = current.firstChild();
+ while (node && !isElementOrText(*node))
+ node = node->nextSibling();
+ return node;
+}
+
+inline Node* ElementAndTextDescendantIterator::nextSibling(Node& current)
+{
+ auto* node = current.nextSibling();
+ while (node && !isElementOrText(*node))
+ node = node->nextSibling();
+ return node;
+}
+
+inline Node* ElementAndTextDescendantIterator::previousSibling(Node& current)
+{
+ auto* node = current.previousSibling();
+ while (node && !isElementOrText(*node))
+ node = node->previousSibling();
+ return node;
+}
+
+inline void ElementAndTextDescendantIterator::popAncestorSiblingStack()
+{
+ m_current = m_ancestorSiblingStack.last().node;
+ m_depth = m_ancestorSiblingStack.last().depth;
+ m_ancestorSiblingStack.removeLast();
+
+#if !ASSERT_DISABLED
+ // Drop the assertion when the iterator reaches the end.
+ if (!m_current)
+ m_assertions.dropEventDispatchAssertion();
+#endif
+}
+
+inline ElementAndTextDescendantIterator& ElementAndTextDescendantIterator::traverseNext()
+{
+ ASSERT(m_current);
+ ASSERT(!m_assertions.domTreeHasMutated());
+
+ auto* firstChild = ElementAndTextDescendantIterator::firstChild(*m_current);
+ auto* nextSibling = ElementAndTextDescendantIterator::nextSibling(*m_current);
+ if (firstChild) {
+ if (nextSibling)
+ m_ancestorSiblingStack.append({ nextSibling, m_depth });
+ ++m_depth;
+ m_current = firstChild;
+ return *this;
+ }
+ if (!nextSibling) {
+ popAncestorSiblingStack();
+ return *this;
+ }
+
+ m_current = nextSibling;
+ return *this;
+}
+
+inline ElementAndTextDescendantIterator& ElementAndTextDescendantIterator::traverseNextSkippingChildren()
+{
+ ASSERT(m_current);
+ ASSERT(!m_assertions.domTreeHasMutated());
+
+ auto* nextSibling = ElementAndTextDescendantIterator::nextSibling(*m_current);
+ if (!nextSibling) {
+ popAncestorSiblingStack();
+ return *this;
+ }
+
+ m_current = nextSibling;
+ return *this;
+}
+
+inline ElementAndTextDescendantIterator& ElementAndTextDescendantIterator::traverseNextSibling()
+{
+ ASSERT(m_current);
+ ASSERT(!m_assertions.domTreeHasMutated());
+
+ m_current = nextSibling(*m_current);
+
+#if !ASSERT_DISABLED
+ if (!m_current)
+ m_assertions.dropEventDispatchAssertion();
+#endif
+ return *this;
+}
+
+inline ElementAndTextDescendantIterator& ElementAndTextDescendantIterator::traversePreviousSibling()
+{
+ ASSERT(m_current);
+ ASSERT(!m_assertions.domTreeHasMutated());
+
+ m_current = previousSibling(*m_current);
+
+#if !ASSERT_DISABLED
+ if (!m_current)
+ m_assertions.dropEventDispatchAssertion();
+#endif
+ return *this;
+}
+
+inline Node& ElementAndTextDescendantIterator::operator*()
+{
+ ASSERT(m_current);
+ ASSERT(isElementOrText(*m_current));
+ ASSERT(!m_assertions.domTreeHasMutated());
+ return *m_current;
+}
+
+inline Node* ElementAndTextDescendantIterator::operator->()
+{
+ ASSERT(m_current);
+ ASSERT(isElementOrText(*m_current));
+ ASSERT(!m_assertions.domTreeHasMutated());
+ return m_current;
+}
+
+inline const Node& ElementAndTextDescendantIterator::operator*() const
+{
+ ASSERT(m_current);
+ ASSERT(isElementOrText(*m_current));
+ ASSERT(!m_assertions.domTreeHasMutated());
+ return *m_current;
+}
+
+inline const Node* ElementAndTextDescendantIterator::operator->() const
+{
+ ASSERT(m_current);
+ ASSERT(isElementOrText(*m_current));
+ ASSERT(!m_assertions.domTreeHasMutated());
+ return m_current;
+}
+
+inline bool ElementAndTextDescendantIterator::operator==(const ElementAndTextDescendantIterator& other) const
+{
+ ASSERT(!m_assertions.domTreeHasMutated());
+ return m_current == other.m_current;
+}
+
+inline bool ElementAndTextDescendantIterator::operator!=(const ElementAndTextDescendantIterator& other) const
+{
+ return !(*this == other);
+}
+
+// ElementAndTextDescendantIteratorAdapter
+
+inline ElementAndTextDescendantIteratorAdapter::ElementAndTextDescendantIteratorAdapter(ContainerNode& root)
+ : m_root(root)
+{
+}
+
+inline ElementAndTextDescendantIterator ElementAndTextDescendantIteratorAdapter::begin()
+{
+ return ElementAndTextDescendantIterator(m_root);
+}
+
+inline ElementAndTextDescendantIterator ElementAndTextDescendantIteratorAdapter::end()
+{
+ return { };
+}
+
+// Standalone functions
+
+inline ElementAndTextDescendantIteratorAdapter elementAndTextDescendants(ContainerNode& root)
+{
+ return ElementAndTextDescendantIteratorAdapter(root);
+}
+
+}
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCoredomElementIteratorAssertionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ElementIteratorAssertions.h (196280 => 196281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ElementIteratorAssertions.h 2016-02-09 01:06:23 UTC (rev 196280)
+++ trunk/Source/WebCore/dom/ElementIteratorAssertions.h 2016-02-09 01:15:52 UTC (rev 196281)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">
</span><span class="cx"> class ElementIteratorAssertions {
</span><span class="cx"> public:
</span><del>- ElementIteratorAssertions(const Element* first = nullptr);
</del><ins>+ ElementIteratorAssertions(const Node* first = nullptr);
</ins><span class="cx"> bool domTreeHasMutated() const;
</span><span class="cx"> void dropEventDispatchAssertion();
</span><span class="cx"> void clear();
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: No real point in doing these as inlines; they are for debugging and we usually turn off inlining in debug builds.
</span><span class="cx">
</span><del>-inline ElementIteratorAssertions::ElementIteratorAssertions(const Element* first)
</del><ins>+inline ElementIteratorAssertions::ElementIteratorAssertions(const Node* first)
</ins><span class="cx"> : m_document(first ? &first->document() : nullptr)
</span><span class="cx"> , m_initialDOMTreeVersion(first ? m_document->domTreeVersion() : 0)
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>