<!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>[213353] trunk</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/213353">213353</a></dd>
<dt>Author</dt> <dd>mattbaker@apple.com</dd>
<dt>Date</dt> <dd>2017-03-02 21:53:34 -0800 (Thu, 02 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Should be able to push nodes in an iframe subtree to the frontend
https://bugs.webkit.org/show_bug.cgi?id=169086
Reviewed by Joseph Pecoraro.
Source/WebCore:
Test: inspector/dom/push-node-by-path-to-frontend.html
* inspector/InspectorDOMAgent.cpp:
(WebCore::InspectorDOMAgent::nodeForPath):
During top-down document traversal, descend into content document nodes
when visiting an HTMLFrameOwnerElement.
Source/WebInspectorUI:
* UserInterface/Views/DOMTreeContentView.js:
(WebInspector.DOMTreeContentView.prototype._selectedNodeDidChange):
Use the URL of the main frame instead of the content frame URL.
LayoutTests:
Added test coverage for DOMTreeManager.prototype.pushNodeByPathToFrontend,
which now supports pushing iframe document nodes (#document) and their descendants.
* inspector/dom/push-node-by-path-to-frontend-expected.txt: Added.
* inspector/dom/push-node-by-path-to-frontend.html: Added.
* inspector/dom/resources/frameset-frame.html: Added.
* inspector/dom/resources/frameset-iframe.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDOMAgentcpp">trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDOMTreeContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeContentView.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsinspectordompushnodebypathtofrontendexpectedtxt">trunk/LayoutTests/inspector/dom/push-node-by-path-to-frontend-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectordompushnodebypathtofrontendhtml">trunk/LayoutTests/inspector/dom/push-node-by-path-to-frontend.html</a></li>
<li><a href="#trunkLayoutTestsinspectordomresourcesframesetframehtml">trunk/LayoutTests/inspector/dom/resources/frameset-frame.html</a></li>
<li><a href="#trunkLayoutTestsinspectordomresourcesframesetiframehtml">trunk/LayoutTests/inspector/dom/resources/frameset-iframe.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (213352 => 213353)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-03-03 05:40:00 UTC (rev 213352)
+++ trunk/LayoutTests/ChangeLog 2017-03-03 05:53:34 UTC (rev 213353)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-03-02 Matt Baker <mattbaker@apple.com>
+
+ Web Inspector: Should be able to push nodes in an iframe subtree to the frontend
+ https://bugs.webkit.org/show_bug.cgi?id=169086
+
+ Reviewed by Joseph Pecoraro.
+
+ Added test coverage for DOMTreeManager.prototype.pushNodeByPathToFrontend,
+ which now supports pushing iframe document nodes (#document) and their descendants.
+
+ * inspector/dom/push-node-by-path-to-frontend-expected.txt: Added.
+ * inspector/dom/push-node-by-path-to-frontend.html: Added.
+ * inspector/dom/resources/frameset-frame.html: Added.
+ * inspector/dom/resources/frameset-iframe.html: Added.
+
</ins><span class="cx"> 2017-03-02 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> LayoutTest media/modern-media-controls/tracks-support/tracks-support-click-track-in-panel.html is a flaky timeout
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordompushnodebypathtofrontendexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/dom/push-node-by-path-to-frontend-expected.txt (0 => 213353)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/dom/push-node-by-path-to-frontend-expected.txt (rev 0)
+++ trunk/LayoutTests/inspector/dom/push-node-by-path-to-frontend-expected.txt 2017-03-03 05:53:34 UTC (rev 213353)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+Test for DOM.pushNodeByPathToFrontend.
+
+
+
+== Running test suite: DOM.pushNodeByPathToFrontend
+-- Running test case: InlineFrameDocumentNode
+Push node with path: 1,HTML,1,BODY,1,IFRAME,0,#document
+PASS: Pushed node has correct path.
+
+-- Running test case: InlineFrameDOMNode
+Push node with path: 1,HTML,1,BODY,2,IFRAME,0,#document,0,HTML,1,BODY,0,DIV
+PASS: Pushed node has correct path.
+
+-- Running test case: InlineFrameFramesetDOMNode
+Push node with path: 1,HTML,1,BODY,3,IFRAME,0,#document,0,HTML,1,FRAMESET,0,FRAME,0,#document,0,HTML,1,BODY,0,P
+PASS: Pushed node has correct path.
+
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectordompushnodebypathtofrontendhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/dom/push-node-by-path-to-frontend.html (0 => 213353)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/dom/push-node-by-path-to-frontend.html (rev 0)
+++ trunk/LayoutTests/inspector/dom/push-node-by-path-to-frontend.html 2017-03-03 05:53:34 UTC (rev 213353)
</span><span class="lines">@@ -0,0 +1,57 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../http/tests/inspector/resources/inspector-test.js"></script>
+<script>
+function test()
+{
+ let suite = InspectorTest.createAsyncSuite("DOM.pushNodeByPathToFrontend");
+
+ function addTestCase({name, description, path}) {
+ suite.addTestCase({
+ name, description,
+ test(resolve, reject) {
+ InspectorTest.log("Push node with path: " + path);
+ WebInspector.domTreeManager.pushNodeByPathToFrontend(path, (nodeIdentifier) => {
+ if (!nodeIdentifier) {
+ reject();
+ return;
+ }
+
+ let node = WebInspector.domTreeManager.nodeForId(nodeIdentifier);
+ InspectorTest.expectEqual(node.path(), path, "Pushed node has correct path.");
+ resolve();
+ });
+ }
+ });
+ }
+
+ addTestCase({
+ name: "InlineFrameDocumentNode",
+ description: "Check that a child frame document node can be pushed.",
+ path: "1,HTML,1,BODY,1,IFRAME,0,#document"
+ });
+
+ addTestCase({
+ name: "InlineFrameDOMNode",
+ description: "Check that a node belonging to an inline frame's DOM can be pushed.",
+ path: "1,HTML,1,BODY,2,IFRAME,0,#document,0,HTML,1,BODY,0,DIV"
+ });
+
+ addTestCase({
+ name: "InlineFrameFramesetDOMNode",
+ description: "Check that a node belonging to a frameset frame's DOM can be pushed.",
+ path: "1,HTML,1,BODY,3,IFRAME,0,#document,0,HTML,1,FRAMESET,0,FRAME,0,#document,0,HTML,1,BODY,0,P"
+ });
+
+ suite.runTestCasesAndFinish();
+}
+</script>
+</head>
+<body onload="runTest()">
+<p>Test for DOM.pushNodeByPathToFrontend.</p>
+<iframe src="about:blank"></iframe>
+<iframe srcdoc="<div></div>"></iframe>
+<iframe src="./resources/frameset-iframe.html"></iframe>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectordomresourcesframesetframehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/dom/resources/frameset-frame.html (0 => 213353)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/dom/resources/frameset-frame.html (rev 0)
+++ trunk/LayoutTests/inspector/dom/resources/frameset-frame.html 2017-03-03 05:53:34 UTC (rev 213353)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+<html>
+ <head></head>
+ <body>
+ <p>Frameset frame contents.</p>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectordomresourcesframesetiframehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/dom/resources/frameset-iframe.html (0 => 213353)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/dom/resources/frameset-iframe.html (rev 0)
+++ trunk/LayoutTests/inspector/dom/resources/frameset-iframe.html 2017-03-03 05:53:34 UTC (rev 213353)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+<html>
+ <head></head>
+ <frameset>
+ <frame src="./frameset-frame.html"/>
+ </frameset>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (213352 => 213353)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-03 05:40:00 UTC (rev 213352)
+++ trunk/Source/WebCore/ChangeLog 2017-03-03 05:53:34 UTC (rev 213353)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2017-03-02 Matt Baker <mattbaker@apple.com>
+
+ Web Inspector: Should be able to push nodes in an iframe subtree to the frontend
+ https://bugs.webkit.org/show_bug.cgi?id=169086
+
+ Reviewed by Joseph Pecoraro.
+
+ Test: inspector/dom/push-node-by-path-to-frontend.html
+
+ * inspector/InspectorDOMAgent.cpp:
+ (WebCore::InspectorDOMAgent::nodeForPath):
+ During top-down document traversal, descend into content document nodes
+ when visiting an HTMLFrameOwnerElement.
+
</ins><span class="cx"> 2017-03-02 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r213274.
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp (213352 => 213353)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2017-03-03 05:40:00 UTC (rev 213352)
+++ trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2017-03-03 05:53:34 UTC (rev 213353)
</span><span class="lines">@@ -2147,28 +2147,37 @@
</span><span class="cx"> {
</span><span class="cx"> // The path is of form "1,HTML,2,BODY,1,DIV"
</span><span class="cx"> if (!m_document)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> Node* node = m_document.get();
</span><span class="cx"> Vector<String> pathTokens;
</span><span class="cx"> path.split(',', false, pathTokens);
</span><span class="cx"> if (!pathTokens.size())
</span><del>- return 0;
</del><ins>+ return nullptr;
+
</ins><span class="cx"> for (size_t i = 0; i < pathTokens.size() - 1; i += 2) {
</span><span class="cx"> bool success = true;
</span><span class="cx"> unsigned childNumber = pathTokens[i].toUInt(&success);
</span><span class="cx"> if (!success)
</span><del>- return 0;
- if (childNumber >= innerChildNodeCount(node))
- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><del>- Node* child = innerFirstChild(node);
- String childName = pathTokens[i + 1];
- for (size_t j = 0; child && j < childNumber; ++j)
- child = innerNextSibling(child);
</del><ins>+ Node* child;
+ if (is<HTMLFrameOwnerElement>(*node)) {
+ ASSERT(!childNumber);
+ auto& frameOwner = downcast<HTMLFrameOwnerElement>(*node);
+ child = frameOwner.contentDocument();
+ } else {
+ if (childNumber >= innerChildNodeCount(node))
+ return nullptr;
</ins><span class="cx">
</span><ins>+ child = innerFirstChild(node);
+ for (size_t j = 0; child && j < childNumber; ++j)
+ child = innerNextSibling(child);
+ }
+
+ const auto& childName = pathTokens[i + 1];
</ins><span class="cx"> if (!child || child->nodeName() != childName)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> node = child;
</span><span class="cx"> }
</span><span class="cx"> return node;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (213352 => 213353)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2017-03-03 05:40:00 UTC (rev 213352)
+++ trunk/Source/WebInspectorUI/ChangeLog 2017-03-03 05:53:34 UTC (rev 213353)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-03-02 Matt Baker <mattbaker@apple.com>
+
+ Web Inspector: Should be able to push nodes in an iframe subtree to the frontend
+ https://bugs.webkit.org/show_bug.cgi?id=169086
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Views/DOMTreeContentView.js:
+ (WebInspector.DOMTreeContentView.prototype._selectedNodeDidChange):
+ Use the URL of the main frame instead of the content frame URL.
+
</ins><span class="cx"> 2017-03-01 Devin Rousso <dcrousso+webkit@gmail.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Annotators should not be enabled if the TextEditor is not visible
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDOMTreeContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeContentView.js (213352 => 213353)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeContentView.js 2017-03-03 05:40:00 UTC (rev 213352)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeContentView.js 2017-03-03 05:53:34 UTC (rev 213353)
</span><span class="lines">@@ -372,7 +372,7 @@
</span><span class="cx"> {
</span><span class="cx"> var selectedDOMNode = this._domTreeOutline.selectedDOMNode();
</span><span class="cx"> if (selectedDOMNode && !this._dontSetLastSelectedNodePath)
</span><del>- this._lastSelectedNodePathSetting.value = {url: selectedDOMNode.ownerDocument.documentURL.hash, path: selectedDOMNode.path()};
</del><ins>+ this._lastSelectedNodePathSetting.value = {url: WebInspector.frameResourceManager.mainFrame.url.hash, path: selectedDOMNode.path()};
</ins><span class="cx">
</span><span class="cx"> if (selectedDOMNode)
</span><span class="cx"> ConsoleAgent.addInspectedNode(selectedDOMNode.id);
</span></span></pre>
</div>
</div>
</body>
</html>