Title: [260623] trunk/Source/WebInspectorUI
Revision
260623
Author
[email protected]
Date
2020-04-23 23:57:48 -0700 (Thu, 23 Apr 2020)

Log Message

Web Inspector: REGRESSION(r257759): Network: waterfall popover is missing bars
https://bugs.webkit.org/show_bug.cgi?id=210947

Reviewed by Brian Burg.

`WI.ResourceTimingBreakdownView` is also used inside of a `WI.Popover`, meaning that the
waterfall graph won't be a child of the `.network-table`. Add a `.network` class to all
instances of `.waterfall` so that the selector can be more specific.

* UserInterface/Views/NetworkTableContentView.js:
(WI.NetworkTableContentView.prototype._populateWaterfallGraph):
* UserInterface/Views/NetworkTableContentView.css:
(.waterfall.network .block): Added.
(body[dir=ltr] .waterfall.network .block): Added.
(body[dir=rtl] .waterfall.network .block): Added.
(.waterfall.network .block + .block): Added.
(.waterfall.network .block:matches(.mouse-tracking, .filler) + .block:not(.mouse-tracking, .filler), .waterfall.network .block:not(.request, .response) + :matches(.request, .response)): Added.
(.waterfall.network .block:last-child): Added.
(.waterfall.network .block.request,): Added.
(.waterfall.network .block.mouse-tracking): Added.
(.waterfall.network .block.filler): Added.
(.waterfall.network .block.redirect): Added.
(.waterfall.network .block.queue): Added.
(.waterfall.network .block.dns): Added.
(.waterfall.network .block.connect): Added.
(.waterfall.network .block.secure): Added.
(.waterfall.network .block.request): Added.
(.waterfall.network .block.response): Added.
(.network-table .waterfall .block): Deleted.
(body[dir=ltr] .network-table .waterfall .block): Deleted.
(body[dir=rtl] .network-table .waterfall .block): Deleted.
(.network-table .waterfall .block + .block): Deleted.
(.network-table .waterfall .block:matches(.mouse-tracking, .filler) + .block:not(.mouse-tracking, .filler), .network-table .waterfall .block:not(.request, .response) + :matches(.request, .response)): Deleted.
(.network-table .waterfall .block:last-child): Deleted.
(.network-table .waterfall .block.request,): Deleted.
(.network-table .waterfall .block.mouse-tracking): Deleted.
(.network-table .waterfall .block.filler): Deleted.
(.network-table .waterfall .block.redirect): Deleted.
(.network-table .waterfall .block.queue): Deleted.
(.network-table .waterfall .block.dns): Deleted.
(.network-table .waterfall .block.connect): Deleted.
(.network-table .waterfall .block.secure): Deleted.
(.network-table .waterfall .block.request): Deleted.
(.network-table .waterfall .block.response): Deleted.
* UserInterface/Views/ResourceTimingBreakdownView.js:
(WI.ResourceTimingBreakdownView.prototype.initialLayout):

Modified Paths

Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (260622 => 260623)


--- trunk/Source/WebInspectorUI/ChangeLog	2020-04-24 06:51:19 UTC (rev 260622)
+++ trunk/Source/WebInspectorUI/ChangeLog	2020-04-24 06:57:48 UTC (rev 260623)
@@ -1,5 +1,54 @@
 2020-04-23  Devin Rousso  <[email protected]>
 
+        Web Inspector: REGRESSION(r257759): Network: waterfall popover is missing bars
+        https://bugs.webkit.org/show_bug.cgi?id=210947
+
+        Reviewed by Brian Burg.
+
+        `WI.ResourceTimingBreakdownView` is also used inside of a `WI.Popover`, meaning that the
+        waterfall graph won't be a child of the `.network-table`. Add a `.network` class to all
+        instances of `.waterfall` so that the selector can be more specific.
+
+        * UserInterface/Views/NetworkTableContentView.js:
+        (WI.NetworkTableContentView.prototype._populateWaterfallGraph):
+        * UserInterface/Views/NetworkTableContentView.css:
+        (.waterfall.network .block): Added.
+        (body[dir=ltr] .waterfall.network .block): Added.
+        (body[dir=rtl] .waterfall.network .block): Added.
+        (.waterfall.network .block + .block): Added.
+        (.waterfall.network .block:matches(.mouse-tracking, .filler) + .block:not(.mouse-tracking, .filler), .waterfall.network .block:not(.request, .response) + :matches(.request, .response)): Added.
+        (.waterfall.network .block:last-child): Added.
+        (.waterfall.network .block.request,): Added.
+        (.waterfall.network .block.mouse-tracking): Added.
+        (.waterfall.network .block.filler): Added.
+        (.waterfall.network .block.redirect): Added.
+        (.waterfall.network .block.queue): Added.
+        (.waterfall.network .block.dns): Added.
+        (.waterfall.network .block.connect): Added.
+        (.waterfall.network .block.secure): Added.
+        (.waterfall.network .block.request): Added.
+        (.waterfall.network .block.response): Added.
+        (.network-table .waterfall .block): Deleted.
+        (body[dir=ltr] .network-table .waterfall .block): Deleted.
+        (body[dir=rtl] .network-table .waterfall .block): Deleted.
+        (.network-table .waterfall .block + .block): Deleted.
+        (.network-table .waterfall .block:matches(.mouse-tracking, .filler) + .block:not(.mouse-tracking, .filler), .network-table .waterfall .block:not(.request, .response) + :matches(.request, .response)): Deleted.
+        (.network-table .waterfall .block:last-child): Deleted.
+        (.network-table .waterfall .block.request,): Deleted.
+        (.network-table .waterfall .block.mouse-tracking): Deleted.
+        (.network-table .waterfall .block.filler): Deleted.
+        (.network-table .waterfall .block.redirect): Deleted.
+        (.network-table .waterfall .block.queue): Deleted.
+        (.network-table .waterfall .block.dns): Deleted.
+        (.network-table .waterfall .block.connect): Deleted.
+        (.network-table .waterfall .block.secure): Deleted.
+        (.network-table .waterfall .block.request): Deleted.
+        (.network-table .waterfall .block.response): Deleted.
+        * UserInterface/Views/ResourceTimingBreakdownView.js:
+        (WI.ResourceTimingBreakdownView.prototype.initialLayout):
+
+2020-04-23  Devin Rousso  <[email protected]>
+
         Web Insspector: Storage: cannot select multiple local storage entries
         https://bugs.webkit.org/show_bug.cgi?id=210876
 

Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.css (260622 => 260623)


--- trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.css	2020-04-24 06:51:19 UTC (rev 260622)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.css	2020-04-24 06:57:48 UTC (rev 260623)
@@ -237,13 +237,13 @@
     font-weight: normal;
 }
 
-/* Styles also used by `WI.ResourceTimingBreakdownView`. */
+/* Styles also used by `WI.ResourceTimingBreakdownView` (also inside a `WI.Popover`). */
 
 .network-table .error {
     color: var(--error-text-color);
 }
 
-.network-table .waterfall .block {
+.waterfall.network .block {
     position: absolute;
     top: 8px;
     min-width: 2px;
@@ -253,7 +253,7 @@
     --end-radius: 2px;
 }
 
-body[dir=ltr] .network-table .waterfall .block {
+body[dir=ltr] .waterfall.network .block {
     border-top-left-radius: var(--start-radius);
     border-top-right-radius: var(--end-radius);
     border-bottom-left-radius: var(--start-radius);
@@ -260,7 +260,7 @@
     border-bottom-right-radius: var(--end-radius);
 }
 
-body[dir=rtl] .network-table .waterfall .block {
+body[dir=rtl] .waterfall.network .block {
     border-top-left-radius: var(--end-radius);
     border-top-right-radius: var(--start-radius);
     border-bottom-left-radius: var(--end-radius);
@@ -267,63 +267,63 @@
     border-bottom-right-radius: var(--start-radius);
 }
 
-.network-table .waterfall .block + .block {
+.waterfall.network .block + .block {
     --start-radius: 0;
     --end-radius: 0;
 }
 
-.network-table .waterfall .block:matches(.mouse-tracking, .filler) + .block:not(.mouse-tracking, .filler),
-.network-table .waterfall .block:not(.request, .response) + :matches(.request, .response) {
+.waterfall.network .block:matches(.mouse-tracking, .filler) + .block:not(.mouse-tracking, .filler),
+.waterfall.network .block:not(.request, .response) + :matches(.request, .response) {
     --start-radius: 2px;
 }
 
-.network-table .waterfall .block:last-child {
+.waterfall.network .block:last-child {
     --end-radius: 2px;
 }
 
-.network-table .waterfall .block.request,
-.network-table .waterfall .block.response {
+.waterfall.network .block.request,
+.waterfall.network .block.response {
     top: 3px;
     height: 14px;
 }
 
-.network-table .waterfall .block.mouse-tracking {
+.waterfall.network .block.mouse-tracking {
     top: 1px;
     z-index: 2;
     height: 18px;
 }
 
-.network-table .waterfall .block.filler {
+.waterfall.network .block.filler {
     top: 9px;
     height: 2px;
     background-color: lightgrey;
 }
 
-.network-table .waterfall .block.redirect {
+.waterfall.network .block.redirect {
     background-color: var(--network-redirect-color);
 }
 
-.network-table .waterfall .block.queue {
+.waterfall.network .block.queue {
     background-color: var(--network-queue-color);
 }
 
-.network-table .waterfall .block.dns {
+.waterfall.network .block.dns {
     background-color: var(--network-dns-color);
 }
 
-.network-table .waterfall .block.connect {
+.waterfall.network .block.connect {
     background-color: var(--network-connect-color);
 }
 
-.network-table .waterfall .block.secure {
+.waterfall.network .block.secure {
     background-color: var(--network-secure-color);
 }
 
-.network-table .waterfall .block.request {
+.waterfall.network .block.request {
     background-color: var(--network-request-color);
 }
 
-.network-table .waterfall .block.response {
+.waterfall.network .block.response {
     background-color: var(--network-response-color);
 }
 

Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js (260622 => 260623)


--- trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js	2020-04-24 06:51:19 UTC (rev 260622)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js	2020-04-24 06:57:48 UTC (rev 260623)
@@ -791,6 +791,8 @@
 
     _populateWaterfallGraph(cell, entry)
     {
+        cell.classList.add("network");
+
         cell.removeChildren();
 
         let container = cell.appendChild(document.createElement("div"));

Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTimingBreakdownView.js (260622 => 260623)


--- trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTimingBreakdownView.js	2020-04-24 06:51:19 UTC (rev 260622)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTimingBreakdownView.js	2020-04-24 06:57:48 UTC (rev 260623)
@@ -141,7 +141,7 @@
         let serverTiming = this._resource.serverTiming;
 
         this._tableElement = this.element.appendChild(document.createElement("table"));
-        this._tableElement.className = "waterfall";
+        this._tableElement.className = "waterfall network";
 
         this._graphStartTime = startTime;
         this._graphEndTime = responseEnd;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to