<!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>[200680] branches/safari-602.1.32-branch/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/200680">200680</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-05-11 01:16:06 -0700 (Wed, 11 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/200600">r200600</a>. rdar://problem/26176524</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602132branchSourceWebInspectorUIChangeLog">branches/safari-602.1.32-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari602132branchSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs">branches/safari-602.1.32-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js</a></li>
<li><a href="#branchessafari602132branchSourceWebInspectorUIUserInterfaceViewsDebuggerSidebarPaneljs">branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602132branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebInspectorUI/ChangeLog (200679 => 200680)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebInspectorUI/ChangeLog 2016-05-11 08:15:17 UTC (rev 200679)
+++ branches/safari-602.1.32-branch/Source/WebInspectorUI/ChangeLog 2016-05-11 08:16:06 UTC (rev 200680)
</span><span class="lines">@@ -1,5 +1,30 @@
</span><span class="cx"> 2016-05-11 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r200600.
+
+ 2016-05-09 Matt Baker <mattbaker@apple.com>
+
+ Web Inspector: Remove Global Breakpoints folder
+ https://bugs.webkit.org/show_bug.cgi?id=157478
+ <rdar://problem/26176524>
+
+ Reviewed by Timothy Hatcher.
+
+ * Localizations/en.lproj/localizedStrings.js:
+ Remove UI string.
+
+ * UserInterface/Views/DebuggerSidebarPanel.js:
+ (WebInspector.DebuggerSidebarPanel):
+ (WebInspector.DebuggerSidebarPanel.prototype._breakpointTreeOutlineContextMenuTreeElement):
+ (WebInspector.DebuggerSidebarPanel.prototype._treeSelectionDidChange):
+ Remove references to folder tree element.
+
+ (WebInspector.DebuggerSidebarPanel.prototype._compareTopLevelTreeElements.isSpecialBreakpoint):
+ (WebInspector.DebuggerSidebarPanel.prototype._compareTopLevelTreeElements):
+ Top level comparison should check for "special" breakpoints.
+
+2016-05-11 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r200594.
</span><span class="cx">
</span><span class="cx"> 2016-05-09 Matt Baker <mattbaker@apple.com>
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (200679 => 200680)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2016-05-11 08:15:17 UTC (rev 200679)
+++ branches/safari-602.1.32-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2016-05-11 08:16:06 UTC (rev 200680)
</span><span class="lines">@@ -362,7 +362,6 @@
</span><span class="cx"> localizedStrings["Function Name Variable"] = "Function Name Variable";
</span><span class="cx"> localizedStrings["Garbage Collection"] = "Garbage Collection";
</span><span class="cx"> localizedStrings["Getter"] = "Getter";
</span><del>-localizedStrings["Global Breakpoints"] = "Global Breakpoints";
</del><span class="cx"> localizedStrings["Global Code"] = "Global Code";
</span><span class="cx"> localizedStrings["Global Lexical Environment"] = "Global Lexical Environment";
</span><span class="cx"> localizedStrings["Global Variables"] = "Global Variables";
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebInspectorUIUserInterfaceViewsDebuggerSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js (200679 => 200680)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js 2016-05-11 08:15:17 UTC (rev 200679)
+++ branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js 2016-05-11 08:16:06 UTC (rev 200680)
</span><span class="lines">@@ -99,10 +99,9 @@
</span><span class="cx"> // Add this offset-sections class name so the sticky headers don't overlap the navigation bar.
</span><span class="cx"> this.element.classList.add(WebInspector.DebuggerSidebarPanel.OffsetSectionsStyleClassName);
</span><span class="cx">
</span><del>- this._globalBreakpointsFolderTreeElement = new WebInspector.FolderTreeElement(WebInspector.UIString("Global Breakpoints"), null, WebInspector.DebuggerSidebarPanel.GlobalIconStyleClassName);
</del><span class="cx"> this._allExceptionsBreakpointTreeElement = new WebInspector.BreakpointTreeElement(WebInspector.debuggerManager.allExceptionsBreakpoint, WebInspector.DebuggerSidebarPanel.ExceptionIconStyleClassName, WebInspector.UIString("All Exceptions"));
</span><span class="cx"> this._allUncaughtExceptionsBreakpointTreeElement = new WebInspector.BreakpointTreeElement(WebInspector.debuggerManager.allUncaughtExceptionsBreakpoint, WebInspector.DebuggerSidebarPanel.ExceptionIconStyleClassName, WebInspector.UIString("All Uncaught Exceptions"));
</span><del>- this.suppressFilteringOnTreeElements([this._globalBreakpointsFolderTreeElement, this._allExceptionsBreakpointTreeElement, this._allUncaughtExceptionsBreakpointTreeElement]);
</del><ins>+ this.suppressFilteringOnTreeElements([this._allExceptionsBreakpointTreeElement, this._allUncaughtExceptionsBreakpointTreeElement]);
</ins><span class="cx">
</span><span class="cx"> this.filterBar.placeholder = WebInspector.UIString("Filter List");
</span><span class="cx">
</span><span class="lines">@@ -137,10 +136,8 @@
</span><span class="cx"> this._breakpointsContentTreeOutline.ondelete = this._breakpointTreeOutlineDeleteTreeElement.bind(this);
</span><span class="cx"> this._breakpointsContentTreeOutline.oncontextmenu = this._breakpointTreeOutlineContextMenuTreeElement.bind(this);
</span><span class="cx">
</span><del>- this._breakpointsContentTreeOutline.appendChild(this._globalBreakpointsFolderTreeElement);
- this._globalBreakpointsFolderTreeElement.appendChild(this._allExceptionsBreakpointTreeElement);
- this._globalBreakpointsFolderTreeElement.appendChild(this._allUncaughtExceptionsBreakpointTreeElement);
- this._globalBreakpointsFolderTreeElement.expand();
</del><ins>+ this._breakpointsContentTreeOutline.appendChild(this._allExceptionsBreakpointTreeElement);
+ this._breakpointsContentTreeOutline.appendChild(this._allUncaughtExceptionsBreakpointTreeElement);
</ins><span class="cx">
</span><span class="cx"> this._scriptsContentTreeOutline = this.createContentTreeOutline(true);
</span><span class="cx"> this._scriptsContentTreeOutline.addEventListener(WebInspector.TreeOutline.Event.SelectionDidChange, this._treeSelectionDidChange, this);
</span><span class="lines">@@ -658,7 +655,7 @@
</span><span class="cx">
</span><span class="cx"> _breakpointTreeOutlineContextMenuTreeElement(event, treeElement)
</span><span class="cx"> {
</span><del>- console.assert(treeElement instanceof WebInspector.ResourceTreeElement || treeElement instanceof WebInspector.ScriptTreeElement || treeElement.constructor === WebInspector.FolderTreeElement);
</del><ins>+ console.assert(treeElement instanceof WebInspector.ResourceTreeElement || treeElement instanceof WebInspector.ScriptTreeElement);
</ins><span class="cx"> if (!(treeElement instanceof WebInspector.ResourceTreeElement) && !(treeElement instanceof WebInspector.ScriptTreeElement))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -714,7 +711,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!(treeElement instanceof WebInspector.BreakpointTreeElement) || treeElement.parent.constructor === WebInspector.FolderTreeElement)
</del><ins>+ if (!(treeElement instanceof WebInspector.BreakpointTreeElement))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> let breakpoint = treeElement.breakpoint;
</span><span class="lines">@@ -735,9 +732,14 @@
</span><span class="cx">
</span><span class="cx"> _compareTopLevelTreeElements(a, b)
</span><span class="cx"> {
</span><del>- if (a === this._globalBreakpointsFolderTreeElement)
</del><ins>+ function isSpecialBreakpoint(treeElement)
+ {
+ return treeElement.representedObject === WebInspector.debuggerManager.allExceptionsBreakpoint || treeElement.representedObject === WebInspector.debuggerManager.allUncaughtExceptionsBreakpoint;
+ }
+
+ if (isSpecialBreakpoint(a))
</ins><span class="cx"> return -1;
</span><del>- if (b === this._globalBreakpointsFolderTreeElement)
</del><ins>+ if (isSpecialBreakpoint(b))
</ins><span class="cx"> return 1;
</span><span class="cx">
</span><span class="cx"> return a.mainTitle.localeCompare(b.mainTitle);
</span></span></pre>
</div>
</div>
</body>
</html>