<!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>[181184] 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/181184">181184</a></dd>
<dt>Author</dt> <dd>jonowells@apple.com</dd>
<dt>Date</dt> <dd>2015-03-06 14:33:27 -0800 (Fri, 06 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Populate Debugger sidebar with all debuggable resources
https://bugs.webkit.org/show_bug.cgi?id=141232
Reviewed by Timothy Hatcher.
All debuggable resources now show in the debugger sidebar. The _resourceAdded handler now adds a script resource
to the sidebar regardless of whether it has any breakpoints set on it. The new function
_getTreeElementForSourceCodeAndAddToContentTreeOutline adds the element to the debugger sidebar before
_addBreakpointsForSourceCode is called. Removing all breakpoints from a resource no longer removes that
resource from the debugger sidebar. TreeOutline.prototype.removeChild has been updated so the disclosure
button will disappear and reappear correctly when removing/adding breakpoints.
* UserInterface/Views/DebuggerSidebarPanel.js:
(WebInspector.DebuggerSidebarPanel.prototype._addBreakpoint): Expand resource if first breakpoint is added.
(WebInspector.DebuggerSidebarPanel.prototype._getTreeElementForSourceCodeAndAddToContentTreeOutline): Created.
(WebInspector.DebuggerSidebarPanel.prototype._resourceAdded): Checks resource type and adds scripts to sidebar.
(WebInspector.DebuggerSidebarPanel.prototype._mainResourceChanged):
(WebInspector.DebuggerSidebarPanel.prototype._scriptAdded):
(WebInspector.DebuggerSidebarPanel.prototype._removeBreakpointTreeElement): No longer removes empty parent.
(WebInspector.DebuggerSidebarPanel.prototype._treeElementSelected): Displays scripts without breakpoints now.
* UserInterface/Views/GeneralTreeElement.js:
(WebInspector.GeneralTreeElement.prototype.get disclosureButton): Drive-by fix. Unused. Deleted.
* UserInterface/Views/TreeOutline.js:
(TreeOutline.prototype.removeChild):
Remove parent class and set hasChildren to false if necessary to properly hide and reveal disclosure button
for elements whose children have been removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDebuggerSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsGeneralTreeElementjs">trunk/Source/WebInspectorUI/UserInterface/Views/GeneralTreeElement.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTreeOutlinejs">trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutline.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (181183 => 181184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-03-06 22:31:28 UTC (rev 181183)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-03-06 22:33:27 UTC (rev 181184)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2015-03-06 Jono Wells <jonowells@apple.com>
+
+ Web Inspector: Populate Debugger sidebar with all debuggable resources
+ https://bugs.webkit.org/show_bug.cgi?id=141232
+
+ Reviewed by Timothy Hatcher.
+
+ All debuggable resources now show in the debugger sidebar. The _resourceAdded handler now adds a script resource
+ to the sidebar regardless of whether it has any breakpoints set on it. The new function
+ _getTreeElementForSourceCodeAndAddToContentTreeOutline adds the element to the debugger sidebar before
+ _addBreakpointsForSourceCode is called. Removing all breakpoints from a resource no longer removes that
+ resource from the debugger sidebar. TreeOutline.prototype.removeChild has been updated so the disclosure
+ button will disappear and reappear correctly when removing/adding breakpoints.
+
+ * UserInterface/Views/DebuggerSidebarPanel.js:
+ (WebInspector.DebuggerSidebarPanel.prototype._addBreakpoint): Expand resource if first breakpoint is added.
+ (WebInspector.DebuggerSidebarPanel.prototype._getTreeElementForSourceCodeAndAddToContentTreeOutline): Created.
+ (WebInspector.DebuggerSidebarPanel.prototype._resourceAdded): Checks resource type and adds scripts to sidebar.
+ (WebInspector.DebuggerSidebarPanel.prototype._mainResourceChanged):
+ (WebInspector.DebuggerSidebarPanel.prototype._scriptAdded):
+ (WebInspector.DebuggerSidebarPanel.prototype._removeBreakpointTreeElement): No longer removes empty parent.
+ (WebInspector.DebuggerSidebarPanel.prototype._treeElementSelected): Displays scripts without breakpoints now.
+
+ * UserInterface/Views/GeneralTreeElement.js:
+ (WebInspector.GeneralTreeElement.prototype.get disclosureButton): Drive-by fix. Unused. Deleted.
+
+ * UserInterface/Views/TreeOutline.js:
+ (TreeOutline.prototype.removeChild):
+ Remove parent class and set hasChildren to false if necessary to properly hide and reveal disclosure button
+ for elements whose children have been removed.
+
</ins><span class="cx"> 2015-03-05 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Follow-up fixes to ObjectTreeBaseTreeElement
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDebuggerSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js (181183 => 181184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js 2015-03-06 22:31:28 UTC (rev 181183)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js 2015-03-06 22:33:27 UTC (rev 181184)
</span><span class="lines">@@ -153,6 +153,7 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.DebuggerSidebarPanel.prototype = {
</span><span class="cx"> constructor: WebInspector.DebuggerSidebarPanel,
</span><ins>+ __proto__: WebInspector.NavigationSidebarPanel.prototype,
</ins><span class="cx">
</span><span class="cx"> // Public
</span><span class="cx">
</span><span class="lines">@@ -278,23 +279,8 @@
</span><span class="cx"> if (!sourceCode)
</span><span class="cx"> return null;
</span><span class="cx">
</span><del>- var parentTreeElement = this._breakpointsContentTreeOutline.getCachedTreeElement(sourceCode);
- if (!parentTreeElement) {
- if (sourceCode instanceof WebInspector.SourceMapResource)
- parentTreeElement = new WebInspector.SourceMapResourceTreeElement(sourceCode);
- else if (sourceCode instanceof WebInspector.Resource)
- parentTreeElement = new WebInspector.ResourceTreeElement(sourceCode);
- else if (sourceCode instanceof WebInspector.Script)
- parentTreeElement = new WebInspector.ScriptTreeElement(sourceCode);
- }
</del><ins>+ var parentTreeElement = this._addTreeElementForSourceCodeToContentTreeOutline(sourceCode);
</ins><span class="cx">
</span><del>- if (!parentTreeElement.parent) {
- parentTreeElement.hasChildren = true;
- parentTreeElement.expand();
-
- this._breakpointsContentTreeOutline.insertChild(parentTreeElement, insertionIndexForObjectInListSortedByFunction(parentTreeElement, this._breakpointsContentTreeOutline.children, this._compareTopLevelTreeElements.bind(this)));
- }
-
</del><span class="cx"> // Mark disabled breakpoints as resolved if there is source code loaded with that URL.
</span><span class="cx"> // This gives the illusion the breakpoint was resolved, but since we don't send disabled
</span><span class="cx"> // breakpoints to the backend we don't know for sure. If the user enables the breakpoint
</span><span class="lines">@@ -304,6 +290,8 @@
</span><span class="cx">
</span><span class="cx"> var breakpointTreeElement = new WebInspector.BreakpointTreeElement(breakpoint);
</span><span class="cx"> parentTreeElement.insertChild(breakpointTreeElement, insertionIndexForObjectInListSortedByFunction(breakpointTreeElement, parentTreeElement.children, this._compareBreakpointTreeElements));
</span><ins>+ if (parentTreeElement.children.length === 1)
+ parentTreeElement.expand();
</ins><span class="cx"> return breakpointTreeElement;
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -314,15 +302,43 @@
</span><span class="cx"> this._addBreakpoint(breakpoints[i], sourceCode);
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ _addTreeElementForSourceCodeToContentTreeOutline: function(sourceCode)
+ {
+ var treeElement = this._breakpointsContentTreeOutline.getCachedTreeElement(sourceCode);
+ if (!treeElement) {
+ if (sourceCode instanceof WebInspector.SourceMapResource)
+ treeElement = new WebInspector.SourceMapResourceTreeElement(sourceCode);
+ else if (sourceCode instanceof WebInspector.Resource)
+ treeElement = new WebInspector.ResourceTreeElement(sourceCode);
+ else if (sourceCode instanceof WebInspector.Script)
+ treeElement = new WebInspector.ScriptTreeElement(sourceCode);
+ }
+
+ if (!treeElement.parent) {
+ treeElement.hasChildren = false;
+ treeElement.expand();
+
+ this._breakpointsContentTreeOutline.insertChild(treeElement, insertionIndexForObjectInListSortedByFunction(treeElement, this._breakpointsContentTreeOutline.children, this._compareTopLevelTreeElements.bind(this)));
+ }
+
+ return treeElement;
+ },
+
</ins><span class="cx"> _resourceAdded: function(event)
</span><span class="cx"> {
</span><span class="cx"> var resource = event.data.resource;
</span><ins>+
+ if (![WebInspector.Resource.Type.Document, WebInspector.Resource.Type.Script].contains(resource.type))
+ return;
+
+ this._addTreeElementForSourceCodeToContentTreeOutline(resource);
</ins><span class="cx"> this._addBreakpointsForSourceCode(resource);
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> _mainResourceChanged: function(event)
</span><span class="cx"> {
</span><span class="cx"> var resource = event.target.mainResource;
</span><ins>+ this._addTreeElementForSourceCodeToContentTreeOutline(resource);
</ins><span class="cx"> this._addBreakpointsForSourceCode(resource);
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -330,11 +346,21 @@
</span><span class="cx"> {
</span><span class="cx"> var script = event.data.script;
</span><span class="cx">
</span><ins>+ // FIXME: Allow for scripts generated by eval statements to appear, but filter out JSC internals
+ // and other WebInspector internals lacking __WebInspector in the url attribute.
+ if (!script.url)
+ return;
+
+ // Exclude inspector scripts.
+ if (script.url && script.url.indexOf("__WebInspector") === 0)
+ return;
+
</ins><span class="cx"> // Don't add breakpoints if the script is represented by a Resource. They were
</span><span class="cx"> // already added by _resourceAdded.
</span><span class="cx"> if (script.resource)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ this._addTreeElementForSourceCodeToContentTreeOutline(script);
</ins><span class="cx"> this._addBreakpointsForSourceCode(script);
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -401,9 +427,6 @@
</span><span class="cx"> parentTreeElement.removeChild(breakpointTreeElement);
</span><span class="cx">
</span><span class="cx"> console.assert(parentTreeElement.parent === this._breakpointsContentTreeOutline);
</span><del>-
- if (!parentTreeElement.children.length)
- this._breakpointsContentTreeOutline.removeChild(parentTreeElement);
</del><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> _debuggerCallFramesDidChange: function()
</span><span class="lines">@@ -560,9 +583,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (treeElement instanceof WebInspector.ResourceTreeElement || treeElement instanceof WebInspector.ScriptTreeElement) {
</span><del>- // If the resource is being selected when it has no children it is in the process of being deleted, don't do anything.
- if (!treeElement.children.length)
- return;
</del><span class="cx"> deselectCallStackContentTreeElements.call(this);
</span><span class="cx"> deselectPauseReasonContentTreeElements.call(this);
</span><span class="cx"> WebInspector.resourceSidebarPanel.showSourceCode(treeElement.representedObject);
</span><span class="lines">@@ -645,7 +665,7 @@
</span><span class="cx"> _updatePauseReasonSection: function()
</span><span class="cx"> {
</span><span class="cx"> var pauseData = WebInspector.debuggerManager.pauseData;
</span><del>-
</del><ins>+
</ins><span class="cx"> switch (WebInspector.debuggerManager.pauseReason) {
</span><span class="cx"> case WebInspector.DebuggerManager.PauseReason.Assertion:
</span><span class="cx"> // FIXME: We should include the assertion condition string.
</span><span class="lines">@@ -653,7 +673,7 @@
</span><span class="cx"> if (pauseData && pauseData.message) {
</span><span class="cx"> this._pauseReasonTextRow.text = WebInspector.UIString("Assertion with message: %s").format(pauseData.message);
</span><span class="cx"> return true;
</span><del>- }
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> this._pauseReasonTextRow.text = WebInspector.UIString("Assertion Failed");
</span><span class="cx"> this._pauseReasonGroup.rows = [this._pauseReasonTextRow];
</span><span class="lines">@@ -731,5 +751,3 @@
</span><span class="cx"> this._pauseReasonLinkContainerElement.appendChild(linkElement);
</span><span class="cx"> }
</span><span class="cx"> };
</span><del>-
-WebInspector.DebuggerSidebarPanel.prototype.__proto__ = WebInspector.NavigationSidebarPanel.prototype;
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsGeneralTreeElementjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/GeneralTreeElement.js (181183 => 181184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/GeneralTreeElement.js 2015-03-06 22:31:28 UTC (rev 181183)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/GeneralTreeElement.js 2015-03-06 22:33:27 UTC (rev 181184)
</span><span class="lines">@@ -61,12 +61,6 @@
</span><span class="cx"> return this._listItemNode;
</span><span class="cx"> },
</span><span class="cx">
</span><del>- get disclosureButton()
- {
- this._createElementsIfNeeded();
- return this._disclosureButton;
- },
-
</del><span class="cx"> get iconElement()
</span><span class="cx"> {
</span><span class="cx"> this._createElementsIfNeeded();
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTreeOutlinejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutline.js (181183 => 181184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutline.js 2015-03-06 22:31:28 UTC (rev 181183)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutline.js 2015-03-06 22:33:27 UTC (rev 181184)
</span><span class="lines">@@ -192,6 +192,11 @@
</span><span class="cx"> throw "child not found in this node's children";
</span><span class="cx">
</span><span class="cx"> this.removeChildAtIndex(childIndex, suppressOnDeselect, suppressSelectSibling);
</span><ins>+
+ if (!this.children.length) {
+ this._listItemNode.classList.remove("parent");
+ this.hasChildren = false;
+ }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> TreeOutline.prototype.removeChildren = function(suppressOnDeselect)
</span></span></pre>
</div>
</div>
</body>
</html>