<!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>[214064] 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/214064">214064</a></dd>
<dt>Author</dt> <dd>mattbaker@apple.com</dd>
<dt>Date</dt> <dd>2017-03-16 13:50:36 -0700 (Thu, 16 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Refactoring: remove DebuggerTreeElement class
https://bugs.webkit.org/show_bug.cgi?id=169697
Reviewed by Devin Rousso.
Remove unnecessary class DebuggerTreeElement from TreeElement class hierarchy.
The `sourceCodeLocation` property on IssueMessage and Breakpoint (the debugger
objects) can be tested for generically using TreeElement.prototype.representedObject.
* UserInterface/Main.html:
Remove file.
* UserInterface/Views/BreakpointTreeElement.js:
* UserInterface/Views/IssueTreeElement.js:
Change base class to GeneralTreeElement.
* UserInterface/Views/DebuggerSidebarPanel.js:
(WebInspector.DebuggerSidebarPanel.prototype._addBreakpoint):
(WebInspector.DebuggerSidebarPanel.prototype._compareTreeElements):
(WebInspector.DebuggerSidebarPanel.prototype._addIssue):
(WebInspector.DebuggerSidebarPanel.prototype._compareDebuggerTreeElements): Deleted.
Renamed to just "_compareTreeElements".
* UserInterface/Views/DebuggerTreeElement.js: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceMainhtml">trunk/Source/WebInspectorUI/UserInterface/Main.html</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsBreakpointTreeElementjs">trunk/Source/WebInspectorUI/UserInterface/Views/BreakpointTreeElement.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDebuggerSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsIssueTreeElementjs">trunk/Source/WebInspectorUI/UserInterface/Views/IssueTreeElement.js</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDebuggerTreeElementjs">trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerTreeElement.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (214063 => 214064)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2017-03-16 20:42:53 UTC (rev 214063)
+++ trunk/Source/WebInspectorUI/ChangeLog 2017-03-16 20:50:36 UTC (rev 214064)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2017-03-16 Matt Baker <mattbaker@apple.com>
+
+ Web Inspector: Refactoring: remove DebuggerTreeElement class
+ https://bugs.webkit.org/show_bug.cgi?id=169697
+
+ Reviewed by Devin Rousso.
+
+ Remove unnecessary class DebuggerTreeElement from TreeElement class hierarchy.
+ The `sourceCodeLocation` property on IssueMessage and Breakpoint (the debugger
+ objects) can be tested for generically using TreeElement.prototype.representedObject.
+
+ * UserInterface/Main.html:
+ Remove file.
+
+ * UserInterface/Views/BreakpointTreeElement.js:
+ * UserInterface/Views/IssueTreeElement.js:
+ Change base class to GeneralTreeElement.
+
+ * UserInterface/Views/DebuggerSidebarPanel.js:
+ (WebInspector.DebuggerSidebarPanel.prototype._addBreakpoint):
+ (WebInspector.DebuggerSidebarPanel.prototype._compareTreeElements):
+ (WebInspector.DebuggerSidebarPanel.prototype._addIssue):
+ (WebInspector.DebuggerSidebarPanel.prototype._compareDebuggerTreeElements): Deleted.
+ Renamed to just "_compareTreeElements".
+
+ * UserInterface/Views/DebuggerTreeElement.js: Removed.
+
</ins><span class="cx"> 2017-03-16 Devin Rousso <webkit@devinrousso.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: RTL: goto arrow for source locations is pointing wrong way in Timeline data grids
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceMainhtml"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Main.html (214063 => 214064)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Main.html 2017-03-16 20:42:53 UTC (rev 214063)
+++ trunk/Source/WebInspectorUI/UserInterface/Main.html 2017-03-16 20:50:36 UTC (rev 214064)
</span><span class="lines">@@ -467,7 +467,6 @@
</span><span class="cx">
</span><span class="cx"> <script src="Views/ConsoleTabContentView.js"></script>
</span><span class="cx"> <script src="Views/DebuggerTabContentView.js"></script>
</span><del>- <script src="Views/DebuggerTreeElement.js"></script>
</del><span class="cx"> <script src="Views/ElementsTabContentView.js"></script>
</span><span class="cx"> <script src="Views/ResourceTreeElement.js"></script>
</span><span class="cx"> <script src="Views/ResourcesTabContentView.js"></script>
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsBreakpointTreeElementjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/BreakpointTreeElement.js (214063 => 214064)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/BreakpointTreeElement.js 2017-03-16 20:42:53 UTC (rev 214063)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/BreakpointTreeElement.js 2017-03-16 20:50:36 UTC (rev 214064)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.BreakpointTreeElement = class BreakpointTreeElement extends WebInspector.DebuggerTreeElement
</del><ins>+WebInspector.BreakpointTreeElement = class BreakpointTreeElement extends WebInspector.GeneralTreeElement
</ins><span class="cx"> {
</span><span class="cx"> constructor(breakpoint, className, title)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDebuggerSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js (214063 => 214064)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js 2017-03-16 20:42:53 UTC (rev 214063)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js 2017-03-16 20:50:36 UTC (rev 214064)
</span><span class="lines">@@ -436,7 +436,7 @@
</span><span class="cx"> breakpoint.resolved = true;
</span><span class="cx">
</span><span class="cx"> let breakpointTreeElement = new WebInspector.BreakpointTreeElement(breakpoint);
</span><del>- parentTreeElement.insertChild(breakpointTreeElement, insertionIndexForObjectInListSortedByFunction(breakpointTreeElement, parentTreeElement.children, this._compareDebuggerTreeElements));
</del><ins>+ parentTreeElement.insertChild(breakpointTreeElement, insertionIndexForObjectInListSortedByFunction(breakpointTreeElement, parentTreeElement.children, this._compareTreeElements));
</ins><span class="cx"> if (parentTreeElement.children.length === 1)
</span><span class="cx"> parentTreeElement.expand();
</span><span class="cx"> return breakpointTreeElement;
</span><span class="lines">@@ -880,13 +880,15 @@
</span><span class="cx"> return a.mainTitle.localeCompare(b.mainTitle);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- _compareDebuggerTreeElements(a, b)
</del><ins>+ _compareTreeElements(a, b)
</ins><span class="cx"> {
</span><del>- if (!a.debuggerObject || !b.debuggerObject)
</del><ins>+ if (!a.representedObject || !b.representedObject)
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><del>- var aLocation = a.debuggerObject.sourceCodeLocation;
- var bLocation = b.debuggerObject.sourceCodeLocation;
</del><ins>+ let aLocation = a.representedObject.sourceCodeLocation;
+ let bLocation = b.representedObject.sourceCodeLocation;
+ if (!aLocation || !bLocation)
+ return 0;
</ins><span class="cx">
</span><span class="cx"> var comparisonResult = aLocation.displayLineNumber - bLocation.displayLineNumber;
</span><span class="cx"> if (comparisonResult !== 0)
</span><span class="lines">@@ -1077,7 +1079,7 @@
</span><span class="cx">
</span><span class="cx"> issueTreeElement = new WebInspector.IssueTreeElement(issueMessage);
</span><span class="cx">
</span><del>- parentTreeElement.insertChild(issueTreeElement, insertionIndexForObjectInListSortedByFunction(issueTreeElement, parentTreeElement.children, this._compareDebuggerTreeElements));
</del><ins>+ parentTreeElement.insertChild(issueTreeElement, insertionIndexForObjectInListSortedByFunction(issueTreeElement, parentTreeElement.children, this._compareTreeElements));
</ins><span class="cx"> if (parentTreeElement.children.length === 1)
</span><span class="cx"> parentTreeElement.expand();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDebuggerTreeElementjs"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerTreeElement.js (214063 => 214064)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerTreeElement.js 2017-03-16 20:42:53 UTC (rev 214063)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerTreeElement.js 2017-03-16 20:50:36 UTC (rev 214064)
</span><span class="lines">@@ -1,39 +0,0 @@
</span><del>-/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-WebInspector.DebuggerTreeElement = class DebuggerTreeElement extends WebInspector.GeneralTreeElement
-{
- constructor(classNames, title, subtitle, representedObject, hasChildren)
- {
- super(classNames, title, subtitle, representedObject, hasChildren);
- }
-
- // Public
-
- get debuggerObject()
- {
- return this.representedObject;
- }
-};
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsIssueTreeElementjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/IssueTreeElement.js (214063 => 214064)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/IssueTreeElement.js 2017-03-16 20:42:53 UTC (rev 214063)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/IssueTreeElement.js 2017-03-16 20:50:36 UTC (rev 214064)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.IssueTreeElement = class IssueTreeElement extends WebInspector.DebuggerTreeElement
</del><ins>+WebInspector.IssueTreeElement = class IssueTreeElement extends WebInspector.GeneralTreeElement
</ins><span class="cx"> {
</span><span class="cx"> constructor(issueMessage)
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>