<!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>[193163] branches/safari-601-branch</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/193163">193163</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 10:52:44 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/188756">r188756</a>. rdar://problem/23221163</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsChangeLog">branches/safari-601-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIChangeLog">branches/safari-601-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceBaseObjectjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/Object.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceModelsFramejs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/Frame.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestshttptestsinspectordomdisconnectdomtreeaftermainframenavigationexpectedtxt">branches/safari-601-branch/LayoutTests/http/tests/inspector/dom/disconnect-dom-tree-after-main-frame-navigation-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestshttptestsinspectordomdisconnectdomtreeaftermainframenavigationhtml">branches/safari-601-branch/LayoutTests/http/tests/inspector/dom/disconnect-dom-tree-after-main-frame-navigation.html</a></li>
<li>branches/safari-601-branch/LayoutTests/http/tests/inspector/dom/resources/</li>
<li><a href="#branchessafari601branchLayoutTestshttptestsinspectordomresourcesnestedframe1deephtml">branches/safari-601-branch/LayoutTests/http/tests/inspector/dom/resources/nested-frame-1-deep.html</a></li>
<li><a href="#branchessafari601branchLayoutTestshttptestsinspectordomresourcesnestedframe2deephtml">branches/safari-601-branch/LayoutTests/http/tests/inspector/dom/resources/nested-frame-2-deep.html</a></li>
<li><a href="#branchessafari601branchLayoutTestshttptestsinspectordomresourcesnestedframebasehtml">branches/safari-601-branch/LayoutTests/http/tests/inspector/dom/resources/nested-frame-base.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193162 => 193163)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-03 18:52:36 UTC (rev 193162)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-03 18:52:44 UTC (rev 193163)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2015-12-02 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r188756. rdar://problem/23221163
+
+ 2015-08-20 Brian Burg <bburg@apple.com>
+
+ Web Inspector: add a regression test for the fix introduced in r188679
+ https://bugs.webkit.org/show_bug.cgi?id=148223
+
+ Reviewed by Joseph Pecoraro.
+
+ Add a regression test to check the number of DOMTree instances that
+ listen to DOMTreeManager.
+
+ * TestExpectations: Don't skip the inspector/dom/ directory.
+ * http/tests/inspector/dom/disconnect-dom-tree-after-main-frame-navigation-expected.txt: Added.
+ * http/tests/inspector/dom/disconnect-dom-tree-after-main-frame-navigation.html: Added.
+ * http/tests/inspector/dom/resources/nested-frame-1-deep.html: Added.
+ * http/tests/inspector/dom/resources/nested-frame-2-deep.html: Added.
+ * http/tests/inspector/dom/resources/nested-frame-base.html: Added.
+
+2015-12-02 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r188631. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-08-18 Joseph Pecoraro <pecoraro@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestshttptestsinspectordomdisconnectdomtreeaftermainframenavigationexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/http/tests/inspector/dom/disconnect-dom-tree-after-main-frame-navigation-expected.txt (0 => 193163)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/http/tests/inspector/dom/disconnect-dom-tree-after-main-frame-navigation-expected.txt (rev 0)
+++ branches/safari-601-branch/LayoutTests/http/tests/inspector/dom/disconnect-dom-tree-after-main-frame-navigation-expected.txt 2015-12-03 18:52:44 UTC (rev 193163)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+Testing that DOMTrees are not retained by DOMTreeManager across main frame navigations.
+
+
+
+== Running test suite: DOM.DisconnectTreeOnMainResourceChange
+-- Running test case: CheckLazyInitializationOfDOMTree
+PASS: There should not be a DOMTree listening to DOMTreeManager events initially.
+DOMTree instance count: 0
+
+-- Running test case: CheckDOMTreeCountAfterUsingGetter
+PASS: There should be a one DOMTree listening to DOMTreeManager events after creation.
+DOMTree instance count: 1
+PASS: There should be four DOMTrees listening to DOMTreeManager events after touching each Frame.
+DOMTree instance count: 4
+
+-- Running test case: CheckDOMTreeCountAfterReloading
+PASS: There should not be any DOMTrees listening to DOMTreeManager events after a main frame navigation.
+DOMTree instance count: 0
+
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestshttptestsinspectordomdisconnectdomtreeaftermainframenavigationhtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/http/tests/inspector/dom/disconnect-dom-tree-after-main-frame-navigation.html (0 => 193163)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/http/tests/inspector/dom/disconnect-dom-tree-after-main-frame-navigation.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/http/tests/inspector/dom/disconnect-dom-tree-after-main-frame-navigation.html 2015-12-03 18:52:44 UTC (rev 193163)
</span><span class="lines">@@ -0,0 +1,68 @@
</span><ins>+<!doctype html>
+<html>
+<head>
+<script src="../resources/inspector-test.js"></script>
+<script>
+function test()
+{
+ let suite = InspectorTest.createAsyncSuite("DOM.DisconnectTreeOnMainResourceChange");
+
+ suite.addTestCase({
+ name: "CheckLazyInitializationOfDOMTree",
+ description: "Check that DOMTree instances are created lazily.",
+ test: (resolve, reject) => {
+ let instances = WebInspector.domTreeManager.retainedObjectsWithPrototype(WebInspector.DOMTree);
+ InspectorTest.expectThat(instances.size === 0, "There should not be a DOMTree listening to DOMTreeManager events initially.");
+ InspectorTest.log("DOMTree instance count: " + instances.size);
+ resolve();
+ }
+ });
+
+ suite.addTestCase({
+ name: "CheckDOMTreeCountAfterUsingGetter",
+ description: "Check that the count of connected DOMTrees is correct after initializing them.",
+ test: (resolve, reject) => {
+ let mainFrame = WebInspector.frameResourceManager.mainFrame;
+ mainFrame.domTree; // Force creation of the root DOM tree.
+
+ let instances = WebInspector.domTreeManager.retainedObjectsWithPrototype(WebInspector.DOMTree);
+ InspectorTest.expectThat(instances.size === 1, "There should be a one DOMTree listening to DOMTreeManager events after creation.");
+ InspectorTest.log("DOMTree instance count: " + instances.size);
+
+ // Force creation of child DOM trees.
+ mainFrame.childFrames[0].domTree;
+ mainFrame.childFrames[0].childFrames[0].domTree;
+ mainFrame.childFrames[0].childFrames[0].childFrames[0].domTree;
+
+ instances = WebInspector.domTreeManager.retainedObjectsWithPrototype(WebInspector.DOMTree);
+ InspectorTest.expectThat(instances.size === 4, "There should be four DOMTrees listening to DOMTreeManager events after touching each Frame.");
+ InspectorTest.log("DOMTree instance count: " + instances.size);
+
+ resolve();
+ }
+ });
+
+ suite.addTestCase({
+ name: "CheckDOMTreeCountAfterReloading",
+ description: "Check that the count of connected DOMTrees is correct after a reload.",
+ test: (resolve, reject) => {
+ WebInspector.Frame.singleFireEventListener(WebInspector.Frame.Event.MainResourceDidChange, (event) => {
+ let instances = WebInspector.domTreeManager.retainedObjectsWithPrototype(WebInspector.DOMTree);
+ InspectorTest.expectThat(instances.size === 0, "There should not be any DOMTrees listening to DOMTreeManager events after a main frame navigation.");
+ InspectorTest.log("DOMTree instance count: " + instances.size);
+ resolve();
+ });
+
+ InspectorTest.reloadPage();
+ }
+ });
+
+ suite.runTestCasesAndFinish();
+}
+</script>
+</head>
+<body onload="runTest()">
+ <p>Testing that DOMTrees are not retained by DOMTreeManager across main frame navigations.</p>
+ <iframe src="resources/nested-frame-2-deep.html"/>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestshttptestsinspectordomresourcesnestedframe1deephtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/http/tests/inspector/dom/resources/nested-frame-1-deep.html (0 => 193163)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/http/tests/inspector/dom/resources/nested-frame-1-deep.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/http/tests/inspector/dom/resources/nested-frame-1-deep.html 2015-12-03 18:52:44 UTC (rev 193163)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+<!doctype html>
+<html>
+<body>
+<div id="frameLabel">1-deep nested frames page.</div>
+<iframe src="nested-frame-base.html"/>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestshttptestsinspectordomresourcesnestedframe2deephtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/http/tests/inspector/dom/resources/nested-frame-2-deep.html (0 => 193163)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/http/tests/inspector/dom/resources/nested-frame-2-deep.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/http/tests/inspector/dom/resources/nested-frame-2-deep.html 2015-12-03 18:52:44 UTC (rev 193163)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+<!doctype html>
+<html>
+<body>
+<div id="frameLabel">2-deep nested frames page.</div>
+<iframe src="nested-frame-1-deep.html"/>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestshttptestsinspectordomresourcesnestedframebasehtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/http/tests/inspector/dom/resources/nested-frame-base.html (0 => 193163)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/http/tests/inspector/dom/resources/nested-frame-base.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/http/tests/inspector/dom/resources/nested-frame-base.html 2015-12-03 18:52:44 UTC (rev 193163)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+<!doctype html>
+<html>
+<body>
+<div id="frameLabel">Nested frame base page.</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193162 => 193163)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:52:36 UTC (rev 193162)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:52:44 UTC (rev 193163)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2015-12-02 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r188756. rdar://problem/23221163
+
+ 2015-08-20 Brian Burg <bburg@apple.com>
+
+ Web Inspector: add a regression test for the fix introduced in r188679
+ https://bugs.webkit.org/show_bug.cgi?id=148223
+
+ Reviewed by Joseph Pecoraro.
+
+ Turns out that we were possibly leaking a single DOMTree on reload.
+ Always clear the main frame's DOMTree as well as those of sub-frames.
+
+ * UserInterface/Base/Object.js: Add back single-fire listeners.
+ (WebInspector.Object.singleFireEventListener.let.wrappedCallback):
+ (WebInspector.Object.singleFireEventListener):
+ (WebInspector.Object.retainedObjectsWithPrototype):
+ (WebInspector.Object.prototype.singleFireEventListener):
+ (WebInspector.Object.prototype.retainedObjectsWithPrototype):
+ * UserInterface/Models/Frame.js:
+ (WebInspector.Frame.prototype.removeAllChildFrames): Clear own tree too.
+
+2015-12-02 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r188750. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-08-20 Joseph Pecoraro <pecoraro@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceBaseObjectjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/Object.js (193162 => 193163)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/Object.js 2015-12-03 18:52:36 UTC (rev 193162)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/Object.js 2015-12-03 18:52:44 UTC (rev 193163)
</span><span class="lines">@@ -55,6 +55,16 @@
</span><span class="cx"> listeners.push({thisObject, listener});
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ static singleFireEventListener(eventType, listener, thisObject)
+ {
+ var wrappedCallback = function() {
+ this.removeEventListener(eventType, wrappedCallback, null);
+ listener.apply(thisObject, arguments);
+ }.bind(this);
+
+ this.addEventListener(eventType, wrappedCallback, null);
+ }
+
</ins><span class="cx"> static removeEventListener(eventType, listener, thisObject)
</span><span class="cx"> {
</span><span class="cx"> eventType = eventType || null;
</span><span class="lines">@@ -100,12 +110,28 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // This should only be used within regression tests to detect leaks.
+ static retainedObjectsWithPrototype(proto)
+ {
+ var results = new Set;
+ for (var eventType in this._listeners) {
+ var recordsForEvent = this._listeners[eventType];
+ for (var listener of recordsForEvent) {
+ if (listener.thisObject instanceof proto)
+ results.add(listener.thisObject);
+ }
+ }
+ return results;
+ }
+
</ins><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> addEventListener() { return WebInspector.Object.addEventListener.apply(this, arguments); }
</span><ins>+ singleFireEventListener() { return WebInspector.Object.singleFireEventListener.apply(this, arguments); }
</ins><span class="cx"> removeEventListener() { return WebInspector.Object.removeEventListener.apply(this, arguments); }
</span><span class="cx"> removeAllListeners() { return WebInspector.Object.removeAllListeners.apply(this, arguments); }
</span><span class="cx"> hasEventListeners() { return WebInspector.Object.hasEventListeners.apply(this, arguments); }
</span><ins>+ retainedObjectsWithPrototype() { return WebInspector.Object.retainedObjectsWithPrototype.apply(this, arguments); }
</ins><span class="cx">
</span><span class="cx"> dispatchEventToListeners(eventType, eventData)
</span><span class="cx"> {
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceModelsFramejs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/Frame.js (193162 => 193163)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/Frame.js 2015-12-03 18:52:36 UTC (rev 193162)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/Frame.js 2015-12-03 18:52:44 UTC (rev 193163)
</span><span class="lines">@@ -338,11 +338,10 @@
</span><span class="cx">
</span><span class="cx"> removeAllChildFrames()
</span><span class="cx"> {
</span><del>- if (!this._childFrames.length)
- return;
</del><ins>+ this._detachFromParentFrame();
</ins><span class="cx">
</span><span class="cx"> for (var childFrame of this._childFrames)
</span><del>- childFrame._detachFromParentFrame();
</del><ins>+ childFrame.removeAllChildFrames();
</ins><span class="cx">
</span><span class="cx"> this._childFrames = [];
</span><span class="cx"> this._childFrameIdentifierMap = {};
</span></span></pre>
</div>
</div>
</body>
</html>