Title: [200600] trunk/Source/WebInspectorUI
- Revision
- 200600
- Author
- mattba...@apple.com
- Date
- 2016-05-09 17:02:30 -0700 (Mon, 09 May 2016)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (200599 => 200600)
--- trunk/Source/WebInspectorUI/ChangeLog 2016-05-10 00:00:06 UTC (rev 200599)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-05-10 00:02:30 UTC (rev 200600)
@@ -1,5 +1,26 @@
2016-05-09 Matt Baker <mattba...@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-09 Matt Baker <mattba...@apple.com>
+
Web Inspector: Heap Snapshot Timeline view can be live
https://bugs.webkit.org/show_bug.cgi?id=157487
<rdar://problem/26178439>
Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (200599 => 200600)
--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2016-05-10 00:00:06 UTC (rev 200599)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2016-05-10 00:02:30 UTC (rev 200600)
@@ -362,7 +362,6 @@
localizedStrings["Function Name Variable"] = "Function Name Variable";
localizedStrings["Garbage Collection"] = "Garbage Collection";
localizedStrings["Getter"] = "Getter";
-localizedStrings["Global Breakpoints"] = "Global Breakpoints";
localizedStrings["Global Code"] = "Global Code";
localizedStrings["Global Lexical Environment"] = "Global Lexical Environment";
localizedStrings["Global Variables"] = "Global Variables";
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js (200599 => 200600)
--- trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js 2016-05-10 00:00:06 UTC (rev 200599)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js 2016-05-10 00:02:30 UTC (rev 200600)
@@ -99,10 +99,9 @@
// Add this offset-sections class name so the sticky headers don't overlap the navigation bar.
this.element.classList.add(WebInspector.DebuggerSidebarPanel.OffsetSectionsStyleClassName);
- this._globalBreakpointsFolderTreeElement = new WebInspector.FolderTreeElement(WebInspector.UIString("Global Breakpoints"), null, WebInspector.DebuggerSidebarPanel.GlobalIconStyleClassName);
this._allExceptionsBreakpointTreeElement = new WebInspector.BreakpointTreeElement(WebInspector.debuggerManager.allExceptionsBreakpoint, WebInspector.DebuggerSidebarPanel.ExceptionIconStyleClassName, WebInspector.UIString("All Exceptions"));
this._allUncaughtExceptionsBreakpointTreeElement = new WebInspector.BreakpointTreeElement(WebInspector.debuggerManager.allUncaughtExceptionsBreakpoint, WebInspector.DebuggerSidebarPanel.ExceptionIconStyleClassName, WebInspector.UIString("All Uncaught Exceptions"));
- this.suppressFilteringOnTreeElements([this._globalBreakpointsFolderTreeElement, this._allExceptionsBreakpointTreeElement, this._allUncaughtExceptionsBreakpointTreeElement]);
+ this.suppressFilteringOnTreeElements([this._allExceptionsBreakpointTreeElement, this._allUncaughtExceptionsBreakpointTreeElement]);
this.filterBar.placeholder = WebInspector.UIString("Filter List");
@@ -137,10 +136,8 @@
this._breakpointsContentTreeOutline._ondelete_ = this._breakpointTreeOutlineDeleteTreeElement.bind(this);
this._breakpointsContentTreeOutline._oncontextmenu_ = this._breakpointTreeOutlineContextMenuTreeElement.bind(this);
- this._breakpointsContentTreeOutline.appendChild(this._globalBreakpointsFolderTreeElement);
- this._globalBreakpointsFolderTreeElement.appendChild(this._allExceptionsBreakpointTreeElement);
- this._globalBreakpointsFolderTreeElement.appendChild(this._allUncaughtExceptionsBreakpointTreeElement);
- this._globalBreakpointsFolderTreeElement.expand();
+ this._breakpointsContentTreeOutline.appendChild(this._allExceptionsBreakpointTreeElement);
+ this._breakpointsContentTreeOutline.appendChild(this._allUncaughtExceptionsBreakpointTreeElement);
this._scriptsContentTreeOutline = this.createContentTreeOutline(true);
this._scriptsContentTreeOutline.addEventListener(WebInspector.TreeOutline.Event.SelectionDidChange, this._treeSelectionDidChange, this);
@@ -658,7 +655,7 @@
_breakpointTreeOutlineContextMenuTreeElement(event, treeElement)
{
- console.assert(treeElement instanceof WebInspector.ResourceTreeElement || treeElement instanceof WebInspector.ScriptTreeElement || treeElement.constructor === WebInspector.FolderTreeElement);
+ console.assert(treeElement instanceof WebInspector.ResourceTreeElement || treeElement instanceof WebInspector.ScriptTreeElement);
if (!(treeElement instanceof WebInspector.ResourceTreeElement) && !(treeElement instanceof WebInspector.ScriptTreeElement))
return;
@@ -714,7 +711,7 @@
return;
}
- if (!(treeElement instanceof WebInspector.BreakpointTreeElement) || treeElement.parent.constructor === WebInspector.FolderTreeElement)
+ if (!(treeElement instanceof WebInspector.BreakpointTreeElement))
return;
let breakpoint = treeElement.breakpoint;
@@ -735,9 +732,14 @@
_compareTopLevelTreeElements(a, b)
{
- if (a === this._globalBreakpointsFolderTreeElement)
+ function isSpecialBreakpoint(treeElement)
+ {
+ return treeElement.representedObject === WebInspector.debuggerManager.allExceptionsBreakpoint || treeElement.representedObject === WebInspector.debuggerManager.allUncaughtExceptionsBreakpoint;
+ }
+
+ if (isSpecialBreakpoint(a))
return -1;
- if (b === this._globalBreakpointsFolderTreeElement)
+ if (isSpecialBreakpoint(b))
return 1;
return a.mainTitle.localeCompare(b.mainTitle);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
