Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (247236 => 247237)
--- trunk/Source/WebInspectorUI/ChangeLog 2019-07-08 23:35:59 UTC (rev 247236)
+++ trunk/Source/WebInspectorUI/ChangeLog 2019-07-08 23:49:10 UTC (rev 247237)
@@ -1,5 +1,26 @@
2019-07-08 Devin Rousso <drou...@apple.com>
+ Web Inspector: Debugger: there should be a different icon for URL breakpoints
+ https://bugs.webkit.org/show_bug.cgi?id=199550
+
+ Reviewed by Joseph Pecoraro.
+
+ Use the same (down|up) arrow icon for the Network Tab and the Network timeline.
+
+ * UserInterface/Views/URLBreakpointTreeElement.js:
+ (WI.URLBreakpointTreeElement):
+ * UserInterface/Views/URLBreakpointTreeElement.css:
+ (.breakpoint.url:not(.breakpoint-paused-icon) .icon): Added.
+
+ * UserInterface/Views/DebuggerSidebarPanel.js:
+ (WI.DebuggerSidebarPanel.prototype._addBreakpoint):
+ * UserInterface/Views/SourcesNavigationSidebarPanel.js:
+ (WI.SourcesNavigationSidebarPanel.prototype._addBreakpoint):
+
+ * UserInterface/Images/URLBreakpoint.svg: Added.
+
+2019-07-08 Devin Rousso <drou...@apple.com>
+
Web Inspector: Timelines: CPU: the Duration string isn't localized
https://bugs.webkit.org/show_bug.cgi?id=199582
<rdar://problem/51698165>
Added: trunk/Source/WebInspectorUI/UserInterface/Images/URLBreakpoint.svg (0 => 247237)
--- trunk/Source/WebInspectorUI/UserInterface/Images/URLBreakpoint.svg (rev 0)
+++ trunk/Source/WebInspectorUI/UserInterface/Images/URLBreakpoint.svg 2019-07-08 23:49:10 UTC (rev 247237)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright © 2019 Apple Inc. All rights reserved. -->
+<svg xmlns="http://www.w3.org/2000/svg" id="root" version="1.1" viewBox="0 0 16 16">
+ <path fill="rgb(148, 183, 219)" d="M 13 1 L 3 1 C 1.898438 1 1 1.898438 1 3 L 1 13 C 1 14.101562 1.898438 15 3 15 L 13 15 C 14.101562 15 15 14.101562 15 13 L 15 3 C 15 1.898438 14.101562 1 13 1 Z"/>
+ <path stroke="rgb(106, 136, 170)" stroke-linejoin="round" stroke-width="2" d="M 11 13.9325755 H 10 V 5.31711004 L 8.46831066 6.74134473 L 7.75 6.0705206 L 10.5 3.50231934 L 13.25 6.0705206 L 12.5316893 6.74134473 L 11 5.31711004 L 11 13.9325755 Z"/>
+ <path stroke="rgb(106, 136, 170)" stroke-linejoin="round" stroke-width="2" d="M 6 2.09199219 H 5 V 10.7839483 L 3.46831066 9.34604471 L 2.75 10.020373 L 5.5 12.6019897 L 8.25 10.020373 L 7.53168934 9.34604471 L 6 10.7839483 L 6 2.09199219 Z"/>
+ <path d="M 11 13.9325755 H 10 V 5.31711004 L 8.46831066 6.74134473 L 7.75 6.0705206 L 10.5 3.50231934 L 13.25 6.0705206 L 12.5316893 6.74134473 L 11 5.31711004 L 11 13.9325755 Z" fill="white"/>
+ <path d="M 6 2.09199219 H 5 V 10.7839483 L 3.46831066 9.34604471 L 2.75 10.020373 L 5.5 12.6019897 L 8.25 10.020373 L 7.53168934 9.34604471 L 6 10.7839483 L 6 2.09199219 Z" fill="white"/>
+ <path fill="rgb(106, 136, 170)" d="M 13 1 L 3 1 C 1.898438 1 1 1.898438 1 3 L 1 13 C 1 14.101562 1.898438 15 3 15 L 13 15 C 14.101562 15 15 14.101562 15 13 L 15 3 C 15 1.898438 14.101562 1 13 1 M 13 2 C 13.550781 2 14 2.449219 14 3 L 14 13 C 14 13.550781 13.550781 14 13 14 L 3 14 C 2.449219 14 2 13.550781 2 13 L 2 3 C 2 2.449219 2.449219 2 3 2 L 13 2"/>
+</svg>
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js (247236 => 247237)
--- trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js 2019-07-08 23:35:59 UTC (rev 247236)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js 2019-07-08 23:49:10 UTC (rev 247237)
@@ -532,10 +532,8 @@
} else if (breakpoint instanceof WI.URLBreakpoint) {
constructor = WI.URLBreakpointTreeElement;
- if (breakpoint === WI.domDebuggerManager.allRequestsBreakpoint) {
- options.className = WI.DebuggerSidebarPanel.AssertionIconStyleClassName;
+ if (breakpoint === WI.domDebuggerManager.allRequestsBreakpoint)
options.title = WI.repeatedUIString.allRequests();
- }
} else {
let sourceCode = breakpoint.sourceCodeLocation && breakpoint.sourceCodeLocation.displaySourceCode;
if (!sourceCode)
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SourcesNavigationSidebarPanel.js (247236 => 247237)
--- trunk/Source/WebInspectorUI/UserInterface/Views/SourcesNavigationSidebarPanel.js 2019-07-08 23:35:59 UTC (rev 247236)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SourcesNavigationSidebarPanel.js 2019-07-08 23:49:10 UTC (rev 247237)
@@ -954,10 +954,8 @@
} else if (breakpoint instanceof WI.URLBreakpoint) {
constructor = WI.URLBreakpointTreeElement;
- if (breakpoint === WI.domDebuggerManager.allRequestsBreakpoint) {
- options.className = "breakpoint-assertion-icon";
+ if (breakpoint === WI.domDebuggerManager.allRequestsBreakpoint)
options.title = WI.repeatedUIString.allRequests();
- }
} else {
let sourceCode = breakpoint.sourceCodeLocation && breakpoint.sourceCodeLocation.displaySourceCode;
if (!sourceCode)
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/URLBreakpointTreeElement.css (247236 => 247237)
--- trunk/Source/WebInspectorUI/UserInterface/Views/URLBreakpointTreeElement.css 2019-07-08 23:35:59 UTC (rev 247236)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/URLBreakpointTreeElement.css 2019-07-08 23:49:10 UTC (rev 247237)
@@ -26,3 +26,7 @@
.breakpoint.url .subtitle {
font-family: Menlo, monospace;
}
+
+.breakpoint.url:not(.breakpoint-paused-icon) .icon {
+ content: url(../Images/URLBreakpoint.svg);
+}
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/URLBreakpointTreeElement.js (247236 => 247237)
--- trunk/Source/WebInspectorUI/UserInterface/Views/URLBreakpointTreeElement.js 2019-07-08 23:35:59 UTC (rev 247236)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/URLBreakpointTreeElement.js 2019-07-08 23:49:10 UTC (rev 247237)
@@ -29,8 +29,9 @@
{
console.assert(breakpoint instanceof WI.URLBreakpoint);
- if (!className)
- className = WI.BreakpointTreeElement.GenericLineIconStyleClassName;
+ let classNames = ["breakpoint", "url"];
+ if (className)
+ classNames.push(className);
let subtitle;
if (!title) {
@@ -41,7 +42,7 @@
subtitle = "/" + breakpoint.url + "/";
}
- super(["breakpoint", "url", className], title, subtitle, breakpoint);
+ super(classNames, title, subtitle, breakpoint);
this.status = WI.ImageUtilities.useSVGSymbol("Images/Breakpoint.svg");
this.status.className = WI.BreakpointTreeElement.StatusImageElementStyleClassName;
