<!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>[161567] 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/161567">161567</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2014-01-09 12:09:53 -0800 (Thu, 09 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Disconnect child frames iteratively
https://bugs.webkit.org/show_bug.cgi?id=126700
Reviewed by Andreas Kling.
Use descendant iterator instead of recursion for traversal.
* dom/ContainerNode.cpp:
(WebCore::willRemoveChild):
(WebCore::willRemoveChildren):
(WebCore::ContainerNode::disconnectDescendantFrames):
* dom/ContainerNodeAlgorithms.cpp:
(WebCore::assertConnectedSubrameCountIsConsistent):
(WebCore::collectFrameOwners):
(WebCore::disconnectSubframes):
Get rid of the strange ChildFrameDisconnector class in favor of a function.
* dom/ContainerNodeAlgorithms.h:
(WebCore::disconnectSubframesIfNeeded):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomContainerNodecpp">trunk/Source/WebCore/dom/ContainerNode.cpp</a></li>
<li><a href="#trunkSourceWebCoredomContainerNodeAlgorithmscpp">trunk/Source/WebCore/dom/ContainerNodeAlgorithms.cpp</a></li>
<li><a href="#trunkSourceWebCoredomContainerNodeAlgorithmsh">trunk/Source/WebCore/dom/ContainerNodeAlgorithms.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161566 => 161567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-09 19:38:41 UTC (rev 161566)
+++ trunk/Source/WebCore/ChangeLog 2014-01-09 20:09:53 UTC (rev 161567)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-01-09 Antti Koivisto <antti@apple.com>
+
+ Disconnect child frames iteratively
+ https://bugs.webkit.org/show_bug.cgi?id=126700
+
+ Reviewed by Andreas Kling.
+
+ Use descendant iterator instead of recursion for traversal.
+
+ * dom/ContainerNode.cpp:
+ (WebCore::willRemoveChild):
+ (WebCore::willRemoveChildren):
+ (WebCore::ContainerNode::disconnectDescendantFrames):
+ * dom/ContainerNodeAlgorithms.cpp:
+ (WebCore::assertConnectedSubrameCountIsConsistent):
+ (WebCore::collectFrameOwners):
+ (WebCore::disconnectSubframes):
+
+ Get rid of the strange ChildFrameDisconnector class in favor of a function.
+
+ * dom/ContainerNodeAlgorithms.h:
+ (WebCore::disconnectSubframesIfNeeded):
+
</ins><span class="cx"> 2014-01-09 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed Windows build fix for r161563.
</span></span></pre></div>
<a id="trunkSourceWebCoredomContainerNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ContainerNode.cpp (161566 => 161567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ContainerNode.cpp 2014-01-09 19:38:41 UTC (rev 161566)
+++ trunk/Source/WebCore/dom/ContainerNode.cpp 2014-01-09 20:09:53 UTC (rev 161567)
</span><span class="lines">@@ -489,7 +489,7 @@
</span><span class="cx"> dispatchChildRemovalEvents(child);
</span><span class="cx"> child.document().nodeWillBeRemoved(&child); // e.g. mutation event listener can create a new range.
</span><span class="cx"> if (child.isContainerNode())
</span><del>- ChildFrameDisconnector(toContainerNode(child)).disconnect();
</del><ins>+ disconnectSubframesIfNeeded(toContainerNode(child), RootAndDescendants);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void willRemoveChildren(ContainerNode& container)
</span><span class="lines">@@ -509,12 +509,12 @@
</span><span class="cx">
</span><span class="cx"> container.document().nodeChildrenWillBeRemoved(container);
</span><span class="cx">
</span><del>- ChildFrameDisconnector(container).disconnect(ChildFrameDisconnector::DescendantsOnly);
</del><ins>+ disconnectSubframesIfNeeded(container, DescendantsOnly);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ContainerNode::disconnectDescendantFrames()
</span><span class="cx"> {
</span><del>- ChildFrameDisconnector(*this).disconnect();
</del><ins>+ disconnectSubframesIfNeeded(*this, RootAndDescendants);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ContainerNode::removeChild(Node* oldChild, ExceptionCode& ec)
</span></span></pre></div>
<a id="trunkSourceWebCoredomContainerNodeAlgorithmscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ContainerNodeAlgorithms.cpp (161566 => 161567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ContainerNodeAlgorithms.cpp 2014-01-09 19:38:41 UTC (rev 161566)
+++ trunk/Source/WebCore/dom/ContainerNodeAlgorithms.cpp 2014-01-09 20:09:53 UTC (rev 161567)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span><del>-unsigned assertConnectedSubrameCountIsConsistent(Node& node)
</del><ins>+static unsigned assertConnectedSubrameCountIsConsistent(ContainerNode& node)
</ins><span class="cx"> {
</span><span class="cx"> unsigned count = 0;
</span><span class="cx">
</span><span class="lines">@@ -110,15 +110,15 @@
</span><span class="cx"> count += assertConnectedSubrameCountIsConsistent(*root);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- for (Node* child = node.firstChild(); child; child = child->nextSibling())
- count += assertConnectedSubrameCountIsConsistent(*child);
</del><ins>+ for (auto& child : childrenOfType<Element>(node))
+ count += assertConnectedSubrameCountIsConsistent(child);
</ins><span class="cx">
</span><span class="cx"> // If we undercount there's possibly a security bug since we'd leave frames
</span><span class="cx"> // in subtrees outside the document.
</span><span class="cx"> ASSERT(node.connectedSubframeCount() >= count);
</span><span class="cx">
</span><span class="cx"> // If we overcount it's safe, but not optimal because it means we'll traverse
</span><del>- // through the document in ChildFrameDisconnector looking for frames that have
</del><ins>+ // through the document in disconnectSubframes looking for frames that have
</ins><span class="cx"> // already been disconnected.
</span><span class="cx"> ASSERT(node.connectedSubframeCount() == count);
</span><span class="cx">
</span><span class="lines">@@ -126,4 +126,54 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+static void collectFrameOwners(Vector<Ref<HTMLFrameOwnerElement>>& frameOwners, ContainerNode& root)
+{
+ auto elementDescendants = descendantsOfType<Element>(root);
+ auto it = elementDescendants.begin();
+ auto end = elementDescendants.end();
+ while (it != end) {
+ Element& element = *it;
+ if (!element.connectedSubframeCount()) {
+ it.traverseNextSkippingChildren();
+ continue;
+ }
+
+ if (element.isHTMLElement() && element.isFrameOwnerElement())
+ frameOwners.append(toHTMLFrameOwnerElement(element));
+
+ if (ShadowRoot* shadowRoot = element.shadowRoot())
+ collectFrameOwners(frameOwners, *shadowRoot);
+ ++it;
+ }
</ins><span class="cx"> }
</span><ins>+
+void disconnectSubframes(ContainerNode& root, SubframeDisconnectPolicy policy)
+{
+#ifndef NDEBUG
+ assertConnectedSubrameCountIsConsistent(root);
+#endif
+ ASSERT(root.connectedSubframeCount());
+
+ Vector<Ref<HTMLFrameOwnerElement>> frameOwners;
+
+ if (policy == RootAndDescendants) {
+ if (root.isHTMLElement() && root.isFrameOwnerElement())
+ frameOwners.append(toHTMLFrameOwnerElement(root));
+ }
+
+ collectFrameOwners(frameOwners, root);
+
+ // Must disable frame loading in the subtree so an unload handler cannot
+ // insert more frames and create loaded frames in detached subtrees.
+ SubframeLoadingDisabler disabler(root);
+
+ for (unsigned i = 0; i < frameOwners.size(); ++i) {
+ auto& owner = frameOwners[i].get();
+ // Don't need to traverse up the tree for the first owner since no
+ // script could have moved it.
+ if (!i || root.containsIncludingShadowDOM(&owner))
+ owner.disconnectContentFrame();
+ }
+}
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoredomContainerNodeAlgorithmsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ContainerNodeAlgorithms.h (161566 => 161567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ContainerNodeAlgorithms.h 2014-01-09 19:38:41 UTC (rev 161566)
+++ trunk/Source/WebCore/dom/ContainerNodeAlgorithms.h 2014-01-09 20:09:53 UTC (rev 161567)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> #define ContainerNodeAlgorithms_h
</span><span class="cx">
</span><span class="cx"> #include "Document.h"
</span><del>-#include "ElementTraversal.h"
</del><ins>+#include "ElementIterator.h"
</ins><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "HTMLFrameOwnerElement.h"
</span><span class="cx"> #include "InspectorInstrumentation.h"
</span><span class="lines">@@ -262,82 +262,19 @@
</span><span class="cx"> notifyNodeRemovedFromTree(toContainerNode(node));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-class ChildFrameDisconnector {
-public:
- enum DisconnectPolicy {
- RootAndDescendants,
- DescendantsOnly
- };
-
- explicit ChildFrameDisconnector(ContainerNode& root)
- : m_root(root)
- {
- }
-
- void disconnect(DisconnectPolicy = RootAndDescendants);
-
-private:
- void collectFrameOwners(ContainerNode& root);
- void disconnectCollectedFrameOwners();
-
- Vector<Ref<HTMLFrameOwnerElement>, 10> m_frameOwners;
- ContainerNode& m_root;
</del><ins>+enum SubframeDisconnectPolicy {
+ RootAndDescendants,
+ DescendantsOnly
</ins><span class="cx"> };
</span><ins>+void disconnectSubframes(ContainerNode& root, SubframeDisconnectPolicy);
</ins><span class="cx">
</span><del>-#ifndef NDEBUG
-unsigned assertConnectedSubrameCountIsConsistent(Node&);
-#endif
-
-inline void ChildFrameDisconnector::collectFrameOwners(ContainerNode& root)
</del><ins>+inline void disconnectSubframesIfNeeded(ContainerNode& root, SubframeDisconnectPolicy policy)
</ins><span class="cx"> {
</span><span class="cx"> if (!root.connectedSubframeCount())
</span><span class="cx"> return;
</span><del>-
- if (root.isHTMLElement() && root.isFrameOwnerElement())
- m_frameOwners.append(toHTMLFrameOwnerElement(root));
-
- for (Element* child = ElementTraversal::firstChild(&root); child; child = ElementTraversal::nextSibling(child))
- collectFrameOwners(*child);
-
- ShadowRoot* shadow = root.isElementNode() ? toElement(root).shadowRoot() : 0;
- if (shadow)
- collectFrameOwners(*shadow);
</del><ins>+ disconnectSubframes(root, policy);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-inline void ChildFrameDisconnector::disconnectCollectedFrameOwners()
-{
- // Must disable frame loading in the subtree so an unload handler cannot
- // insert more frames and create loaded frames in detached subtrees.
- SubframeLoadingDisabler disabler(m_root);
-
- for (unsigned i = 0; i < m_frameOwners.size(); ++i) {
- HTMLFrameOwnerElement& owner = m_frameOwners[i].get();
- // Don't need to traverse up the tree for the first owner since no
- // script could have moved it.
- if (!i || m_root.containsIncludingShadowDOM(&owner))
- owner.disconnectContentFrame();
- }
-}
-
-inline void ChildFrameDisconnector::disconnect(DisconnectPolicy policy)
-{
-#ifndef NDEBUG
- assertConnectedSubrameCountIsConsistent(m_root);
-#endif
-
- if (!m_root.connectedSubframeCount())
- return;
-
- if (policy == RootAndDescendants)
- collectFrameOwners(m_root);
- else {
- for (Element* child = ElementTraversal::firstChild(&m_root); child; child = ElementTraversal::nextSibling(child))
- collectFrameOwners(*child);
- }
-
- disconnectCollectedFrameOwners();
-}
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ContainerNodeAlgorithms_h
</span></span></pre>
</div>
</div>
</body>
</html>