Reland "Fix background on rows with error network logview"
Original change's description:
> Revert "Fix background on rows with error network logview"
>
> This reverts commit 48c9ef678756730eb4ea3dd92d13fadf3b665beb.
>
> Reason for revert: the this._isFailed() function is not defined on NetworkNode,
> its defined on NetworkRequestNode.
> It's causing the network tool to fail with errors when drawing these nodes:
> https://imgur.com/jj6vJUE
>
> Repro: network tool against bing.com
> https://imgur.com/m9EuCZS
>
> Original change's description:
> > Fix background on rows with error network logview
> >
> > This cl will fix the background of selected rows with errors
> > in the Network panel.
> >
> > Screenshots: https://imgur.com/a/ZFIgDHN
> >
> > Fixed: 1028075
> > Change-Id: If345c820fcac6f2c6628c97244852269cfcab3fa
> > Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/1944857
> > Commit-Queue: Jan Scheffler <[email protected]>
> > Reviewed-by: Tim van der Lippe <[email protected]>
>
> [email protected],[email protected],[email protected]
>
> Change-Id: I82c0ad283cab06e137767c0188414917d744dc13
> Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/1962713
> Reviewed-by: Lorne Mitchell <[email protected]>
> Reviewed-by: Brandon Goddard <[email protected]>
> Commit-Queue: Brandon Goddard <[email protected]>
[email protected],[email protected],[email protected],[email protected],[email protected]
Change-Id: I6ed9f8d0883d69c72dce168f04da36e2e38efaaa
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/1962292
Commit-Queue: Jan Scheffler <[email protected]>
Reviewed-by: Jan Scheffler <[email protected]>
diff --git a/front_end/network/NetworkDataGridNode.js b/front_end/network/NetworkDataGridNode.js
index c3dd208..e52eac5 100644
--- a/front_end/network/NetworkDataGridNode.js
+++ b/front_end/network/NetworkDataGridNode.js
@@ -71,12 +71,25 @@
}
/**
+ * @return {boolean}
+ */
+ _isFailed() {
+ return false;
+ }
+
+ /**
* @return {string}
* @suppressGlobalPropertiesCheck
*/
backgroundColor() {
- const bgColors = Network.NetworkNode._backgroundColors;
- if (this.selected && (this.dataGrid.element === document.activeElement) && document.hasFocus()) {
+ const bgColors = _backgroundColors;
+ const hasFocus = document.hasFocus();
+ const isSelected = this.dataGrid.element === document.activeElement;
+ const isFailed = this._isFailed();
+
+ if (this.selected && hasFocus && isSelected && isFailed) {
+ return bgColors.FocusSelectedHasError;
+ } else if (this.selected && hasFocus && isSelected) {
return bgColors.FocusSelected;
} else if (this.selected) {
return bgColors.Selected;
@@ -261,6 +274,7 @@
InitiatedPath: '--network-grid-initiated-path-color',
Selected: '--network-grid-selected-color',
FocusSelected: '--network-grid-focus-selected-color',
+ FocusSelectedHasError: '--network-grid-focus-selected-color-has-error',
FromFrame: '--network-grid-from-frame-color',
};
diff --git a/front_end/network/networkLogView.css b/front_end/network/networkLogView.css
index 5558f98..246f92b 100644
--- a/front_end/network/networkLogView.css
+++ b/front_end/network/networkLogView.css
@@ -54,6 +54,7 @@
--network-grid-initiated-path-color: rgba(217, 58, 58, 0.4);
--network-grid-selected-color: rgba(219, 219, 219, .6);
--network-grid-focus-selected-color: var(--selection-bg-color);
+ --network-grid-focus-selected-color-has-error: rgb(255, 240, 240, 1.0);
--network-grid-from-frame-color: rgba(224, 247, 250, .4);
--network-grid-is-product-color: rgba(255, 252, 225, .6);
}
@@ -67,6 +68,7 @@
--network-grid-initiated-path-color: rgba(217, 58, 58, 0.4);
--network-grid-selected-color: rgba(57, 57, 57, .6);
--network-grid-focus-selected-color: var(--selection-bg-color);
+ --network-grid-focus-selected-color-has-error: rgba(217, 58, 58, 0.15);
--network-grid-from-frame-color: rgba(224, 247, 250, .4);
--network-grid-is-product-color: rgba(255, 252, 225, .6);
}
@@ -183,7 +185,6 @@
.network-log-grid.data-grid:focus tr.selected.network-error-row,
.network-log-grid.data-grid:focus tr.selected.network-error-row .network-cell-subtitle,
.network-log-grid.data-grid:focus tr.selected.network-error-row .network-dim-cell {
- background: hsl(0, 100%, 97%) !important;
color: rgb(230, 0, 0) !important;
}
.initiator-column .devtools-link {
