Attachment 373575 Details for Bug 199550 – Patch

[patch] Patch

bug-199550-20190706123651.patch (text/plain), 7.22 KB, created by Devin Rousso on 2019-07-06 12:36:52 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Devin Rousso

Created: 2019-07-06 12:36:52 PDT

Size: 7.22 KB

patch

obsolete

>diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
>index 81b5be3e689e68d8dd6e2fd96a6bdecc06460d12..47dc437b99957ae95234f2f68ae833ab631e885e 100644
>--- a/Source/WebInspectorUI/ChangeLog
>+++ b/Source/WebInspectorUI/ChangeLog
>@@ -1,3 +1,24 @@
>+2019-07-06  Devin Rousso  <drousso@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 NOBODY (OOPS!).
>+
>+        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-05  Devin Rousso  <drousso@apple.com>
> 
>         Web Inspector: current call frame indicator not visible in dark mode
>diff --git a/Source/WebInspectorUI/UserInterface/Images/URLBreakpoint.svg b/Source/WebInspectorUI/UserInterface/Images/URLBreakpoint.svg
>new file mode 100644
>index 0000000000000000000000000000000000000000..2fd1d78dad7286be88f49e05046774240c4affba
>--- /dev/null
>+++ b/Source/WebInspectorUI/UserInterface/Images/URLBreakpoint.svg
>@@ -0,0 +1,10 @@
>+<?xml version="1.0" encoding="utf-8"?>
>+
>+<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.3325755 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.3325755 Z"/>
>+    <path stroke="rgb(106, 136, 170)" stroke-linejoin="round" stroke-width="2" d="M 6 2.79199219 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.79199219 Z"/>
>+    <path d="M 11 13.3325755 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.3325755 Z" fill="white"/>
>+    <path d="M 6 2.79199219 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.79199219 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>
>diff --git a/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js b/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js
>index 9bb6a68485e8fbcddd5e560742e5d761075d0ede..90f3de22d71beafe477b5387a49ad96c3b61c0e3 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js
>@@ -532,10 +532,8 @@ WI.DebuggerSidebarPanel = class DebuggerSidebarPanel extends WI.NavigationSideba
>         } 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)
>diff --git a/Source/WebInspectorUI/UserInterface/Views/SourcesNavigationSidebarPanel.js b/Source/WebInspectorUI/UserInterface/Views/SourcesNavigationSidebarPanel.js
>index 1bd1dc6bc6e8295b3092ff28b245307d6a7299be..f8187864c2091e6610a4f03d02fa82339262eb02 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/SourcesNavigationSidebarPanel.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/SourcesNavigationSidebarPanel.js
>@@ -954,10 +954,8 @@ WI.SourcesNavigationSidebarPanel = class SourcesNavigationSidebarPanel extends W
>         } 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)
>diff --git a/Source/WebInspectorUI/UserInterface/Views/URLBreakpointTreeElement.css b/Source/WebInspectorUI/UserInterface/Views/URLBreakpointTreeElement.css
>index e01107c0a776a3e10837e4707d0a9ce96b8105ce..50e184820df89601f2ca72a4b4ab7a20d4407f99 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/URLBreakpointTreeElement.css
>+++ b/Source/WebInspectorUI/UserInterface/Views/URLBreakpointTreeElement.css
>@@ -26,3 +26,7 @@
> .breakpoint.url .subtitle {
>     font-family: Menlo, monospace;
> }
>+
>+.breakpoint.url:not(.breakpoint-paused-icon) .icon {
>+    content: url(../Images/URLBreakpoint.svg);
>+}
>diff --git a/Source/WebInspectorUI/UserInterface/Views/URLBreakpointTreeElement.js b/Source/WebInspectorUI/UserInterface/Views/URLBreakpointTreeElement.js
>index 5413c32b8818e3557518e6c7f4631783f099e758..0e5455c03fd28beeb4ab93697c57c7db36add075 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/URLBreakpointTreeElement.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/URLBreakpointTreeElement.js
>@@ -29,8 +29,9 @@ WI.URLBreakpointTreeElement = class URLBreakpointTreeElement extends WI.GeneralT
>     {
>         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 @@ WI.URLBreakpointTreeElement = class URLBreakpointTreeElement extends WI.GeneralT
>                 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;

Actions: View | Formatted Diff | Diff

Attachments on bug 199550: 373575 | 373576 | 373669 | 373671