<!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>[199207] trunk/Source/WebInspectorUI</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/199207">199207</a></dd>
<dt>Author</dt> <dd>mattbaker@apple.com</dd>
<dt>Date</dt> <dd>2016-04-07 18:24:47 -0700 (Thu, 07 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: OpenResourceDialog should keep its resources list up-to-date
https://bugs.webkit.org/show_bug.cgi?id=155321
<rdar://problem/25093890>
Reviewed by Timothy Hatcher.
The Quick Open dialog should listen for resource change events, refreshing
the resource list and current query results as needed.
* UserInterface/Views/OpenResourceDialog.js:
(WebInspector.OpenResourceDialog):
(WebInspector.OpenResourceDialog.prototype.didDismissDialog):
Unregister resource event handlers.
(WebInspector.OpenResourceDialog.prototype.didPresentDialog):
Register resource event handlers and add main frame resources.
(WebInspector.OpenResourceDialog.prototype._addResource):
Add resource to the query controller, if valid. Optionally suppress
the potentially expensive filter update, which is useful when adding
multiple resources at once.
(WebInspector.OpenResourceDialog.prototype._addResourcesForFrame):
Add the entire frame resource tree and update dialog filter.
(WebInspector.OpenResourceDialog.prototype._mainResourceDidChange):
(WebInspector.OpenResourceDialog.prototype._resourceWasAdded):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsOpenResourceDialogjs">trunk/Source/WebInspectorUI/UserInterface/Views/OpenResourceDialog.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (199206 => 199207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-04-08 01:22:11 UTC (rev 199206)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-04-08 01:24:47 UTC (rev 199207)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2016-04-07 Matt Baker <mattbaker@apple.com>
+
+ Web Inspector: OpenResourceDialog should keep its resources list up-to-date
+ https://bugs.webkit.org/show_bug.cgi?id=155321
+ <rdar://problem/25093890>
+
+ Reviewed by Timothy Hatcher.
+
+ The Quick Open dialog should listen for resource change events, refreshing
+ the resource list and current query results as needed.
+
+ * UserInterface/Views/OpenResourceDialog.js:
+ (WebInspector.OpenResourceDialog):
+ (WebInspector.OpenResourceDialog.prototype.didDismissDialog):
+ Unregister resource event handlers.
+
+ (WebInspector.OpenResourceDialog.prototype.didPresentDialog):
+ Register resource event handlers and add main frame resources.
+
+ (WebInspector.OpenResourceDialog.prototype._addResource):
+ Add resource to the query controller, if valid. Optionally suppress
+ the potentially expensive filter update, which is useful when adding
+ multiple resources at once.
+
+ (WebInspector.OpenResourceDialog.prototype._addResourcesForFrame):
+ Add the entire frame resource tree and update dialog filter.
+
+ (WebInspector.OpenResourceDialog.prototype._mainResourceDidChange):
+ (WebInspector.OpenResourceDialog.prototype._resourceWasAdded):
+
</ins><span class="cx"> 2016-04-07 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: ProfileView source links are off by 1 line, worse in pretty printed code
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsOpenResourceDialogjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/OpenResourceDialog.js (199206 => 199207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/OpenResourceDialog.js 2016-04-08 01:22:11 UTC (rev 199206)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/OpenResourceDialog.js 2016-04-08 01:24:47 UTC (rev 199207)
</span><span class="lines">@@ -120,27 +120,22 @@
</span><span class="cx">
</span><span class="cx"> didDismissDialog()
</span><span class="cx"> {
</span><ins>+ WebInspector.Frame.removeEventListener(WebInspector.Frame.Event.MainResourceDidChange, this._mainResourceDidChange, this);
+ WebInspector.Frame.removeEventListener(WebInspector.Frame.Event.ResourceWasAdded, this._resourceWasAdded, this);
+
</ins><span class="cx"> this._queryController.reset();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> didPresentDialog()
</span><span class="cx"> {
</span><ins>+ WebInspector.Frame.addEventListener(WebInspector.Frame.Event.MainResourceDidChange, this._mainResourceDidChange, this);
+ WebInspector.Frame.addEventListener(WebInspector.Frame.Event.ResourceWasAdded, this._resourceWasAdded, this);
+
+ if (WebInspector.frameResourceManager.mainFrame)
+ this._addResourcesForFrame(WebInspector.frameResourceManager.mainFrame);
+
</ins><span class="cx"> this._inputElement.focus();
</span><span class="cx"> this._clear();
</span><del>-
- let frames = [WebInspector.frameResourceManager.mainFrame];
- while (frames.length) {
- let frame = frames.shift();
- let resources = [frame.mainResource].concat(frame.resources);
- for (let resource of resources) {
- if (!this.representedObjectIsValid(resource))
- continue;
-
- this._queryController.addResource(resource);
- }
-
- frames = frames.concat(frame.childFrames);
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Private
</span><span class="lines">@@ -248,6 +243,48 @@
</span><span class="cx">
</span><span class="cx"> this.dismiss(treeElement.representedObject);
</span><span class="cx"> }
</span><ins>+
+ _addResource(resource, suppressFilterUpdate)
+ {
+ if (!this.representedObjectIsValid(resource))
+ return;
+
+ this._queryController.addResource(resource);
+ if (suppressFilterUpdate)
+ return;
+
+ this._updateFilter();
+ }
+
+ _addResourcesForFrame(frame)
+ {
+ const suppressFilterUpdate = true;
+
+ let frames = [frame];
+ while (frames.length) {
+ let currentFrame = frames.shift();
+ let resources = [currentFrame.mainResource].concat(currentFrame.resources);
+ for (let resource of resources)
+ this._addResource(resource, suppressFilterUpdate);
+
+ frames = frames.concat(frame.childFrames);
+ }
+
+ this._updateFilter();
+ }
+
+ _mainResourceDidChange(event)
+ {
+ if (event.target.isMainFrame())
+ this._queryController.reset();
+
+ this._addResource(event.target.mainResource);
+ }
+
+ _resourceWasAdded(event)
+ {
+ this._addResource(event.data.resource);
+ }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.OpenResourceDialog.NonEmptyClassName = "non-empty";
</span></span></pre>
</div>
</div>
</body>
</html>