Remove last usage of maybeRetrieveContextTypes in Revealer
Revealers can't use maybeRetrieveContextTypes because a revealer
must load be able to trigger loading of the panel in which it
wants to reveal something.
This CL removes the last usage of said function in a revealer,
hence resolving bug 1196676.
Fixed: chromium:1196676
Change-Id: I96d799170de5ee53739ae6efe53d14f2cc117b6f
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/2963813
Commit-Queue: Sigurd Schneider <[email protected]>
Reviewed-by: Tim van der Lippe <[email protected]>
diff --git a/front_end/panels/network/BUILD.gn b/front_end/panels/network/BUILD.gn
index f8cde7d..5b68ceb 100644
--- a/front_end/panels/network/BUILD.gn
+++ b/front_end/panels/network/BUILD.gn
@@ -20,7 +20,6 @@
"NetworkManageCustomHeadersView.ts",
"NetworkOverview.ts",
"NetworkPanel.ts",
- "NetworkRequestId.ts",
"NetworkSearchScope.ts",
"NetworkTimeCalculator.ts",
"NetworkWaterfallColumn.ts",
diff --git a/front_end/panels/network/NetworkDataGridNode.ts b/front_end/panels/network/NetworkDataGridNode.ts
index 2c2a770..6ee90f6 100644
--- a/front_end/panels/network/NetworkDataGridNode.ts
+++ b/front_end/panels/network/NetworkDataGridNode.ts
@@ -55,7 +55,6 @@
import type {NetworkTimeCalculator} from './NetworkTimeCalculator.js'; // eslint-disable-line no-unused-vars
-import {NetworkRequestId} from './NetworkRequestId.js';
import {imageNameForResourceType} from './utils/utils.js';
const UIStrings = {
@@ -1095,7 +1094,9 @@
const networkManager = SDK.NetworkManager.NetworkManager.forRequest(this._request);
if (webBundleInnerRequestInfo.bundleRequestId && networkManager) {
cell.appendChild(Components.Linkifier.Linkifier.linkifyRevealable(
- new NetworkRequestId(webBundleInnerRequestInfo.bundleRequestId, networkManager), secondIconElement));
+ new NetworkForward.NetworkRequestId.NetworkRequestId(
+ webBundleInnerRequestInfo.bundleRequestId, networkManager),
+ secondIconElement));
} else {
cell.appendChild(secondIconElement);
}
diff --git a/front_end/panels/network/NetworkLogView.ts b/front_end/panels/network/NetworkLogView.ts
index fc325d3..0b8b7dd 100644
--- a/front_end/panels/network/NetworkLogView.ts
+++ b/front_end/panels/network/NetworkLogView.ts
@@ -58,7 +58,6 @@
import {NetworkLogViewColumns} from './NetworkLogViewColumns.js';
import type {NetworkTimeCalculator} from './NetworkTimeCalculator.js';
import {NetworkTimeBoundary, NetworkTransferDurationCalculator, NetworkTransferTimeCalculator} from './NetworkTimeCalculator.js'; // eslint-disable-line no-unused-vars
-import type {NetworkRequestId} from './NetworkRequestId.js';
const UIStrings = {
/**
@@ -1814,7 +1813,7 @@
}
}
- revealAndHighlightRequestWithId(requestId: NetworkRequestId): void {
+ revealAndHighlightRequestWithId(requestId: NetworkForward.NetworkRequestId.NetworkRequestId): void {
const request = Logs.NetworkLog.NetworkLog.instance().requestByManagerAndId(requestId.manager, requestId.requestId);
if (request) {
this.revealAndHighlightRequest(request);
diff --git a/front_end/panels/network/NetworkPanel.ts b/front_end/panels/network/NetworkPanel.ts
index f1010de..6618afe 100644
--- a/front_end/panels/network/NetworkPanel.ts
+++ b/front_end/panels/network/NetworkPanel.ts
@@ -57,7 +57,6 @@
import {NetworkSearchScope} from './NetworkSearchScope.js'; // eslint-disable-line no-unused-vars
import type {NetworkTimeCalculator} from './NetworkTimeCalculator.js';
import {NetworkTransferTimeCalculator} from './NetworkTimeCalculator.js'; // eslint-disable-line no-unused-vars
-import {NetworkRequestId} from './NetworkRequestId.js';
const UIStrings = {
/**
@@ -623,7 +622,7 @@
}
}
- revealAndHighlightRequestWithId(request: NetworkRequestId): void {
+ revealAndHighlightRequestWithId(request: NetworkForward.NetworkRequestId.NetworkRequestId): void {
this._hideRequestPanel();
if (request) {
this._networkLogView.revealAndHighlightRequestWithId(request);
@@ -860,7 +859,7 @@
}
reveal(requestId: Object): Promise<void> {
- if (!(requestId instanceof NetworkRequestId)) {
+ if (!(requestId instanceof NetworkForward.NetworkRequestId.NetworkRequestId)) {
return Promise.reject(new Error('Internal error: not a network request ID'));
}
const panel = NetworkPanel._instance();
diff --git a/front_end/panels/network/forward/BUILD.gn b/front_end/panels/network/forward/BUILD.gn
index fda9fd4..9e7649f 100644
--- a/front_end/panels/network/forward/BUILD.gn
+++ b/front_end/panels/network/forward/BUILD.gn
@@ -8,6 +8,7 @@
devtools_module("forward") {
sources = [
+ "NetworkRequestId.ts",
"UIFilter.ts",
"UIRequestLocation.ts",
]
diff --git a/front_end/panels/network/NetworkRequestId.ts b/front_end/panels/network/forward/NetworkRequestId.ts
similarity index 81%
rename from front_end/panels/network/NetworkRequestId.ts
rename to front_end/panels/network/forward/NetworkRequestId.ts
index 3566238..86c8072 100644
--- a/front_end/panels/network/NetworkRequestId.ts
+++ b/front_end/panels/network/forward/NetworkRequestId.ts
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-import type * as SDK from '../../core/sdk/sdk.js'; // eslint-disable-line no-unused-vars
+import type * as SDK from '../../../core/sdk/sdk.js'; // eslint-disable-line no-unused-vars
export class NetworkRequestId {
requestId: string;
diff --git a/front_end/panels/network/forward/forward.ts b/front_end/panels/network/forward/forward.ts
index 7e942a4..5dde0da 100644
--- a/front_end/panels/network/forward/forward.ts
+++ b/front_end/panels/network/forward/forward.ts
@@ -2,10 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+import * as NetworkRequestId from './NetworkRequestId.js';
import * as UIFilter from './UIFilter.js';
import * as UIRequestLocation from './UIRequestLocation.js';
export {
+ NetworkRequestId,
UIFilter,
UIRequestLocation,
};
diff --git a/front_end/panels/network/network-meta.ts b/front_end/panels/network/network-meta.ts
index ce1565c..4005447 100644
--- a/front_end/panels/network/network-meta.ts
+++ b/front_end/panels/network/network-meta.ts
@@ -368,7 +368,7 @@
Common.Revealer.registerRevealer({
contextTypes() {
- return maybeRetrieveContextTypes(Network => [Network.NetworkRequestId.NetworkRequestId]);
+ return [NetworkForward.NetworkRequestId.NetworkRequestId];
},
destination: Common.Revealer.RevealerDestination.NETWORK_PANEL,
async loadRevealer() {
diff --git a/front_end/panels/network/network.ts b/front_end/panels/network/network.ts
index 4f3bed1..f35898d 100644
--- a/front_end/panels/network/network.ts
+++ b/front_end/panels/network/network.ts
@@ -14,7 +14,6 @@
import './NetworkLogViewColumns.js';
import './NetworkFrameGrouper.js';
import './NetworkManageCustomHeadersView.js';
-import './NetworkRequestId.js';
import './NetworkSearchScope.js';
import './NetworkWaterfallColumn.js';
import './RequestCookiesView.js';
@@ -41,7 +40,6 @@
import * as NetworkManageCustomHeadersView from './NetworkManageCustomHeadersView.js';
import * as NetworkOverview from './NetworkOverview.js';
import * as NetworkPanel from './NetworkPanel.js';
-import * as NetworkRequestId from './NetworkRequestId.js';
import * as NetworkSearchScope from './NetworkSearchScope.js';
import * as NetworkTimeCalculator from './NetworkTimeCalculator.js';
import * as NetworkWaterfallColumn from './NetworkWaterfallColumn.js';
@@ -68,7 +66,6 @@
NetworkManageCustomHeadersView,
NetworkOverview,
NetworkPanel,
- NetworkRequestId,
NetworkSearchScope,
NetworkTimeCalculator,
NetworkWaterfallColumn,