<!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>[208826] 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/208826">208826</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-11-16 16:35:57 -0800 (Wed, 16 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use more references for Document::removeFocusedNodeOfSubtree()
https://bugs.webkit.org/show_bug.cgi?id=164839
Reviewed by Andreas Kling.
Use more references for Document::removeFocusedNodeOfSubtree().
No new tests, no Web-exposed behavior change.
* dom/Document.cpp:
(WebCore::isNodeInSubtree):
(WebCore::Document::removeFocusedNodeOfSubtree):
(WebCore::Document::nodeChildrenWillBeRemoved):
(WebCore::Document::nodeWillBeRemoved):
(WebCore::Document::removeFocusNavigationNodeOfSubtree):
(WebCore::Document::removeFullScreenElementOfSubtree):
* dom/Document.h:
* dom/Element.cpp:
(WebCore::Element::removeShadowRoot):
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::clear):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208825 => 208826)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-17 00:35:32 UTC (rev 208825)
+++ trunk/Source/WebCore/ChangeLog 2016-11-17 00:35:57 UTC (rev 208826)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-11-16 Chris Dumez <cdumez@apple.com>
+
+ Use more references for Document::removeFocusedNodeOfSubtree()
+ https://bugs.webkit.org/show_bug.cgi?id=164839
+
+ Reviewed by Andreas Kling.
+
+ Use more references for Document::removeFocusedNodeOfSubtree().
+
+ No new tests, no Web-exposed behavior change.
+
+ * dom/Document.cpp:
+ (WebCore::isNodeInSubtree):
+ (WebCore::Document::removeFocusedNodeOfSubtree):
+ (WebCore::Document::nodeChildrenWillBeRemoved):
+ (WebCore::Document::nodeWillBeRemoved):
+ (WebCore::Document::removeFocusNavigationNodeOfSubtree):
+ (WebCore::Document::removeFullScreenElementOfSubtree):
+ * dom/Document.h:
+ * dom/Element.cpp:
+ (WebCore::Element::removeShadowRoot):
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::clear):
+
</ins><span class="cx"> 2016-11-16 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Clear track client when removing a track
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (208825 => 208826)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2016-11-17 00:35:32 UTC (rev 208825)
+++ trunk/Source/WebCore/dom/Document.cpp 2016-11-17 00:35:57 UTC (rev 208826)
</span><span class="lines">@@ -3531,27 +3531,24 @@
</span><span class="cx"> audioProducer->pageMutedStateDidChange();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool isNodeInSubtree(Node* node, Node* container, bool amongChildrenOnly)
</del><ins>+static bool isNodeInSubtree(Node& node, Node& container, bool amongChildrenOnly)
</ins><span class="cx"> {
</span><del>- bool nodeInSubtree = false;
</del><span class="cx"> if (amongChildrenOnly)
</span><del>- nodeInSubtree = node->isDescendantOf(container);
</del><ins>+ return node.isDescendantOf(&container);
</ins><span class="cx"> else
</span><del>- nodeInSubtree = (node == container) || node->isDescendantOf(container);
-
- return nodeInSubtree;
</del><ins>+ return &node == &container || node.isDescendantOf(&container);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void Document::removeFocusedNodeOfSubtree(Node* node, bool amongChildrenOnly)
</del><ins>+void Document::removeFocusedNodeOfSubtree(Node& node, bool amongChildrenOnly)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_focusedElement || pageCacheState() != NotInPageCache) // If the document is in the page cache, then we don't need to clear out the focused node.
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- Element* focusedElement = node->treeScope().focusedElement();
</del><ins>+ Element* focusedElement = node.treeScope().focusedElement();
</ins><span class="cx"> if (!focusedElement)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (isNodeInSubtree(focusedElement, node, amongChildrenOnly)) {
</del><ins>+ if (isNodeInSubtree(*focusedElement, node, amongChildrenOnly)) {
</ins><span class="cx"> setFocusedElement(nullptr, FocusDirectionNone, FocusRemovalEventsMode::DoNotDispatch);
</span><span class="cx"> // Set the focus navigation starting node to the previous focused element so that
</span><span class="cx"> // we can fallback to the siblings or parent node for the next search.
</span><span class="lines">@@ -3890,11 +3887,11 @@
</span><span class="cx"> {
</span><span class="cx"> NoEventDispatchAssertion assertNoEventDispatch;
</span><span class="cx">
</span><del>- removeFocusedNodeOfSubtree(&container, true /* amongChildrenOnly */);
</del><ins>+ removeFocusedNodeOfSubtree(container, true /* amongChildrenOnly */);
</ins><span class="cx"> removeFocusNavigationNodeOfSubtree(container, true /* amongChildrenOnly */);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><del>- removeFullScreenElementOfSubtree(&container, true /* amongChildrenOnly */);
</del><ins>+ removeFullScreenElementOfSubtree(container, true /* amongChildrenOnly */);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> for (auto* range : m_ranges)
</span><span class="lines">@@ -3919,31 +3916,31 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Document::nodeWillBeRemoved(Node& n)
</del><ins>+void Document::nodeWillBeRemoved(Node& node)
</ins><span class="cx"> {
</span><span class="cx"> NoEventDispatchAssertion assertNoEventDispatch;
</span><span class="cx">
</span><del>- removeFocusedNodeOfSubtree(&n);
- removeFocusNavigationNodeOfSubtree(n);
</del><ins>+ removeFocusedNodeOfSubtree(node);
+ removeFocusNavigationNodeOfSubtree(node);
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><del>- removeFullScreenElementOfSubtree(&n);
</del><ins>+ removeFullScreenElementOfSubtree(node);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> for (auto* it : m_nodeIterators)
</span><del>- it->nodeWillBeRemoved(n);
</del><ins>+ it->nodeWillBeRemoved(node);
</ins><span class="cx">
</span><span class="cx"> for (auto* range : m_ranges)
</span><del>- range->nodeWillBeRemoved(n);
</del><ins>+ range->nodeWillBeRemoved(node);
</ins><span class="cx">
</span><span class="cx"> if (Frame* frame = this->frame()) {
</span><del>- frame->eventHandler().nodeWillBeRemoved(n);
- frame->selection().nodeWillBeRemoved(n);
- frame->page()->dragCaretController().nodeWillBeRemoved(n);
</del><ins>+ frame->eventHandler().nodeWillBeRemoved(node);
+ frame->selection().nodeWillBeRemoved(node);
+ frame->page()->dragCaretController().nodeWillBeRemoved(node);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (is<Text>(n))
- m_markers->removeMarkers(&n);
</del><ins>+ if (is<Text>(node))
+ m_markers->removeMarkers(&node);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static Node* fallbackFocusNavigationStartingNodeAfterRemoval(Node& node)
</span><span class="lines">@@ -3956,7 +3953,7 @@
</span><span class="cx"> if (!m_focusNavigationStartingNode)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (isNodeInSubtree(m_focusNavigationStartingNode.get(), &node, amongChildrenOnly)) {
</del><ins>+ if (isNodeInSubtree(*m_focusNavigationStartingNode, node, amongChildrenOnly)) {
</ins><span class="cx"> m_focusNavigationStartingNode = amongChildrenOnly ? &node : fallbackFocusNavigationStartingNodeAfterRemoval(node);
</span><span class="cx"> m_focusNavigationStartingNodeIsRemoved = true;
</span><span class="cx"> }
</span><span class="lines">@@ -5959,7 +5956,7 @@
</span><span class="cx"> webkitCancelFullScreen();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Document::removeFullScreenElementOfSubtree(Node* node, bool amongChildrenOnly)
</del><ins>+void Document::removeFullScreenElementOfSubtree(Node& node, bool amongChildrenOnly)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_fullScreenElement)
</span><span class="cx"> return;
</span><span class="lines">@@ -5966,9 +5963,9 @@
</span><span class="cx">
</span><span class="cx"> bool elementInSubtree = false;
</span><span class="cx"> if (amongChildrenOnly)
</span><del>- elementInSubtree = m_fullScreenElement->isDescendantOf(node);
</del><ins>+ elementInSubtree = m_fullScreenElement->isDescendantOf(&node);
</ins><span class="cx"> else
</span><del>- elementInSubtree = (m_fullScreenElement == node) || m_fullScreenElement->isDescendantOf(node);
</del><ins>+ elementInSubtree = (m_fullScreenElement == &node) || m_fullScreenElement->isDescendantOf(&node);
</ins><span class="cx">
</span><span class="cx"> if (elementInSubtree)
</span><span class="cx"> fullScreenElementRemoved();
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (208825 => 208826)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2016-11-17 00:35:32 UTC (rev 208825)
+++ trunk/Source/WebCore/dom/Document.h 2016-11-17 00:35:57 UTC (rev 208826)
</span><span class="lines">@@ -707,7 +707,7 @@
</span><span class="cx"> void setFocusNavigationStartingNode(Node*);
</span><span class="cx"> Element* focusNavigationStartingNode(FocusDirection) const;
</span><span class="cx">
</span><del>- void removeFocusedNodeOfSubtree(Node*, bool amongChildrenOnly = false);
</del><ins>+ void removeFocusedNodeOfSubtree(Node&, bool amongChildrenOnly = false);
</ins><span class="cx"> void hoveredElementDidDetach(Element*);
</span><span class="cx"> void elementInActiveChainDidDetach(Element*);
</span><span class="cx">
</span><span class="lines">@@ -1109,7 +1109,7 @@
</span><span class="cx"> void fullScreenChangeDelayTimerFired();
</span><span class="cx"> bool fullScreenIsAllowedForElement(Element*) const;
</span><span class="cx"> void fullScreenElementRemoved();
</span><del>- void removeFullScreenElementOfSubtree(Node*, bool amongChildrenOnly = false);
</del><ins>+ void removeFullScreenElementOfSubtree(Node&, bool amongChildrenOnly = false);
</ins><span class="cx"> bool isAnimatingFullScreen() const;
</span><span class="cx"> WEBCORE_EXPORT void setAnimatingFullScreen(bool);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (208825 => 208826)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2016-11-17 00:35:32 UTC (rev 208825)
+++ trunk/Source/WebCore/dom/Element.cpp 2016-11-17 00:35:57 UTC (rev 208826)
</span><span class="lines">@@ -1768,7 +1768,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> InspectorInstrumentation::willPopShadowRoot(*this, *oldRoot);
</span><del>- document().removeFocusedNodeOfSubtree(oldRoot.get());
</del><ins>+ document().removeFocusedNodeOfSubtree(*oldRoot);
</ins><span class="cx">
</span><span class="cx"> ASSERT(!oldRoot->renderer());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (208825 => 208826)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2016-11-17 00:35:32 UTC (rev 208825)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2016-11-17 00:35:57 UTC (rev 208826)
</span><span class="lines">@@ -586,7 +586,7 @@
</span><span class="cx"> bool hadLivingRenderTree = m_frame.document()->hasLivingRenderTree();
</span><span class="cx"> m_frame.document()->prepareForDestruction();
</span><span class="cx"> if (hadLivingRenderTree)
</span><del>- m_frame.document()->removeFocusedNodeOfSubtree(m_frame.document());
</del><ins>+ m_frame.document()->removeFocusedNodeOfSubtree(*m_frame.document());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Do this after detaching the document so that the unload event works.
</span></span></pre>
</div>
</div>
</body>
</html>