Merge remote-tracking branch 'origin/main' into hoxyq-7103-repo-sync

Author: hoxyq

.github/workflows/build.yml

@@ -5,7 +5,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v3
       with:

build

@@ -732,7 +732,7 @@ grd_files_release_sources = [
   "front_end/third_party/codemirror.next/chunk/codemirror.js",
   "front_end/third_party/codemirror.next/chunk/cpp.js",
   "front_end/third_party/codemirror.next/chunk/java.js",
-  "front_end/third_party/codemirror.next/chunk/.js",
+  "front_end/third_party/codemirror.next/chunk/legacy.js",
   "front_end/third_party/codemirror.next/chunk/less.js",
   "front_end/third_party/codemirror.next/chunk/markdown.js",
   "front_end/third_party/codemirror.next/chunk/php.js",
@@ -806,7 +806,7 @@ grd_files_release_sources = [
   "front_end/ui/legacy/components/source_frame/source_frame-meta.js",
   "front_end/ui/legacy/components/source_frame/source_frame.js",
   "front_end/ui/legacy/components/utils/utils.js",
-  "front_end/ui/legacy/.js",
+  "front_end/ui/legacy/legacy.js",
   "front_end/ui/legacy/theme_support/theme_support.js",
   "front_end/ui/lit/lit.js",
   "front_end/ui/visual_logging/visual_logging.js",
@@ -937,7 +937,6 @@ grd_files_debug_sources = [
   "front_end/core/sdk/PaintProfiler.js",
   "front_end/core/sdk/PerformanceMetricsModel.js",
   "front_end/core/sdk/PreloadingModel.js",
-  "front_end/core/sdk/ProfileTreeModel.js",
   "front_end/core/sdk/ReactNativeApplicationModel.js",
   "front_end/core/sdk/RehydratingConnection.js",
   "front_end/core/sdk/RehydratingObject.js",
@@ -2578,18 +2577,14 @@ grd_files_debug_sources = [
   "front_end/ui/legacy/infobar.css.js",
   "front_end/ui/legacy/inlineButton.css.js",
   "front_end/ui/legacy/inspectorCommon.css.js",
-  "front_end/ui/legacy/inspectorCommon.css.js",
-  "front_end/ui/legacy/inspectorSyntaxHighlight.css.js",
   "front_end/ui/legacy/inspectorViewTabbedPane.css.js",
   "front_end/ui/legacy/listWidget.css.js",
   "front_end/ui/legacy/popover.css.js",
   "front_end/ui/legacy/progressIndicator.css.js",
-  "front_end/ui/legacy/radioButton.css.js",
   "front_end/ui/legacy/remoteDebuggingTerminatedScreen.css.js",
   "front_end/ui/legacy/reportView.css.js",
   "front_end/ui/legacy/rootView.css.js",
   "front_end/ui/legacy/searchableView.css.js",
-  "front_end/ui/legacy/slider.css.js",
   "front_end/ui/legacy/smallBubble.css.js",
   "front_end/ui/legacy/softContextMenu.css.js",
   "front_end/ui/legacy/softDropDown.css.js",
@@ -2598,9 +2593,7 @@ grd_files_debug_sources = [
   "front_end/ui/legacy/suggestBox.css.js",
   "front_end/ui/legacy/tabbedPane.css.js",
   "front_end/ui/legacy/targetCrashedScreen.css.js",
-  "front_end/ui/legacy/textButton.css.js",
   "front_end/ui/legacy/textPrompt.css.js",
-  "front_end/ui/legacy/themeColors.css.js",
   "front_end/ui/legacy/theme_support/ThemeSupport.js",
   "front_end/ui/legacy/toolbar.css.js",
   "front_end/ui/legacy/treeoutline.css.js",

buildtools

@@ -77,12 +77,9 @@ node_action("html_entrypoints") {
     "js_app",
     "ndb_app",
     "node_app",
-<<<<<<< HEAD
     "rn_fusebox",
     "rn_inspector",
-=======
     "rehydrated_devtools_app",
->>>>>>> chromedevtools/chromium/7103
     "worker_app",
     "device_mode_emulation_frame",
   ]

config/gni/devtools_grd_files.gni

@@ -392,11 +392,13 @@ export const resourceCategories = {
 };
 
 export const resourceCategoriesReactNative = {
-  XHR: new ResourceCategory(i18nLazyString(UIStrings.fetchAndXHR), i18n.i18n.lockedLazyString('Fetch/XHR')),
-  Script: new ResourceCategory(i18nLazyString(UIStrings.javascript), i18nLazyString(UIStrings.js)),
-  Image: new ResourceCategory(i18nLazyString(UIStrings.image), i18nLazyString(UIStrings.img)),
-  Media: new ResourceCategory(i18nLazyString(UIStrings.media), i18nLazyString(UIStrings.media)),
-  Other: new ResourceCategory(i18nLazyString(UIStrings.other), i18nLazyString(UIStrings.other)),
+  XHR: new ResourceCategory(
+    'Fetch and XHR', i18nLazyString(UIStrings.fetchAndXHR), i18n.i18n.lockedLazyString('Fetch/XHR')),
+  Script:
+    new ResourceCategory(UIStrings.javascript, i18nLazyString(UIStrings.javascript), i18nLazyString(UIStrings.js)),
+  Image: new ResourceCategory(UIStrings.image, i18nLazyString(UIStrings.image), i18nLazyString(UIStrings.img)),
+  Media: new ResourceCategory(UIStrings.media, i18nLazyString(UIStrings.media), i18nLazyString(UIStrings.media)),
+  Other: new ResourceCategory(UIStrings.other, i18nLazyString(UIStrings.other), i18nLazyString(UIStrings.other)),
 };
 
 /**

front_end/BUILD.gn

@@ -626,6 +626,12 @@ function initializeInspectorFrontendHost(): void {
 
   // Attach the events object.
   InspectorFrontendHostInstance.events = new Common.ObjectWrapper.ObjectWrapper();
+
+  // @ts-expect-error Global injected by the React Native DevTools shell.
+  const {reactNativeDecorateInspectorFrontendHostInstance} = globalThis;
+  if (typeof reactNativeDecorateInspectorFrontendHostInstance === 'function') {
+    reactNativeDecorateInspectorFrontendHostInstance(InspectorFrontendHostInstance);
+  }
 }
 
 // FIXME: This file is included into both apps, since the devtools_app needs the InspectorFrontendHostAPI only,

front_end/core/common/ResourceType.ts

@@ -3,9 +3,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import {type ParsedURL} from '../common/ParsedURL.js';
+import type {ParsedURL} from '../common/ParsedURL.js';
 
-import {type DeveloperResourceLoaded} from './UserMetrics.js';
+import type {DeveloperResourceLoaded} from './UserMetrics.js';
 
 export type RNReliabilityEventListener = (event: DecoratedReactNativeChromeDevToolsEvent) => void;
 
@@ -22,13 +22,13 @@ type PanelLocation = 'main'|'drawer';
 type UnsubscribeFn = () => void;
 class RNPerfMetrics {
   readonly #consoleErrorMethod = 'error';
-  #listeners: Set<RNReliabilityEventListener> = new Set();
+  #listeners = new Set<RNReliabilityEventListener>();
   #launchId: string|null = null;
   #appId: string|null = null;
   #entryPoint: EntryPoint = 'rn_inspector';
   #telemetryInfo: Object = {};
   // map of panel location to panel name
-  #currentPanels: Map<PanelLocation, string> = new Map();
+  #currentPanels = new Map<PanelLocation, string>();
 
   addEventListener(listener: RNReliabilityEventListener): UnsubscribeFn {
     this.#listeners.add(listener);
@@ -295,7 +295,7 @@ function getPerfTimestamp(): DOMHighResTimeStamp {
 
 function maybeTruncateDeveloperResourceUrl(parsedURL: ParsedURL): string {
   const {url} = parsedURL;
-  return parsedURL.isHttpOrHttps() ? url : `${url.slice(0, 100)} …(omitted ${url.length - 100} characters)`;
+  return parsedURL.scheme === 'http' || parsedURL.scheme === 'https' ? url : `${url.slice(0, 100)} …(omitted ${url.length - 100} characters)`;
 }
 
 function maybeWrapError(baseMessage: string, error: unknown): [string, Error] {

front_end/core/host/InspectorFrontendHost.ts

@@ -59,14 +59,14 @@ type RNExperimentPredicate = ({
 }: {
   isReactNativeEntryPoint: boolean,
 }) => boolean;
-type RNExperimentSpec = {
-  name: RNExperimentName,
-  title: string,
-  unstable: boolean,
-  docLink?: string,
-  feedbackLink?: string,
-  enabledByDefault?: boolean | RNExperimentPredicate,
-};
+interface RNExperimentSpec {
+  name: RNExperimentName;
+  title: string;
+  unstable: boolean;
+  docLink?: string;
+  feedbackLink?: string;
+  enabledByDefault?: boolean | RNExperimentPredicate;
+}
 
 class RNExperiment {
   readonly name: RNExperimentName;
@@ -100,7 +100,7 @@ function normalizePredicate(
 }
 
 class RNExperimentsSupport {
-  #experiments: Map<Root.Runtime.RNExperimentName, RNExperiment> = new Map();
+  #experiments = new Map<Root.Runtime.RNExperimentName, RNExperiment>();
   #defaultEnabledCoreExperiments = new Set<Root.Runtime.ExperimentName>();
 
   register(spec: RNExperimentSpec): void {
@@ -142,7 +142,7 @@ class RNExperimentsSupport {
     }
   }
 
-  copyInto(other: Root.Runtime.ExperimentsSupport, titlePrefix: string = ''): void {
+  copyInto(other: Root.Runtime.ExperimentsSupport, titlePrefix = ''): void {
     for (const [name, spec] of this.#experiments) {
       other.register(
         name,

front_end/core/host/RNPerfMetrics.ts

@@ -302,21 +302,18 @@ export class Experiment {
 export const experiments = new ExperimentsSupport();
 
 // React Native-specific experiments, see rn_experiments.ts
-// eslint-disable-next-line rulesdir/const_enum
 export enum RNExperimentName {
   REACT_NATIVE_SPECIFIC_UI = 'react-native-specific-ui',
   JS_HEAP_PROFILER_ENABLE = 'js-heap-profiler-enable',
   ENABLE_PERFORMANCE_PANEL = 'enable-performance-panel',
   ENABLE_NETWORK_PANEL = 'enable-network-panel',
 }
 
-// TODO(crbug.com/1167717): Make this a const enum again
-// eslint-disable-next-line rulesdir/const_enum
 export enum ConditionName {
-  CAN_DOCK = 'can_dock',
   NOT_SOURCES_HIDE_ADD_FOLDER = '!sources.hide_add_folder',
   REACT_NATIVE_UNSTABLE_NETWORK_PANEL = 'unstable_enableNetworkPanel',
 }
+
 export const enum ExperimentName {
   CAPTURE_NODE_CREATION_STACKS = 'capture-node-creation-stacks',
   CSS_OVERVIEW = 'css-overview',

front_end/core/rn_experiments/experimentsImpl.ts

@@ -89,13 +89,13 @@ export class WebSocketConnection implements ProtocolClient.InspectorBackend.Conn
   #socket: WebSocket|null;
   onMessage: ((arg0: (Object|string)) => void)|null;
   #onDisconnect: ((arg0: string) => void)|null;
-  #onWebSocketDisconnect: ((connectionLostDetails?: {reason?: Platform.UIString.LocalizedString, code?: string, errorType?: string}) => void)|null;
+  #onWebSocketDisconnect: ((connectionLostDetails?: {reason?: string, code?: string, errorType?: string}) => void)|null;
   #connected: boolean;
   #messages: string[];
   constructor(
       url: Platform.DevToolsPath.UrlString,
-      onWebSocketDisconnect: (connectionLostDetails?: {reason?: Platform.UIString.LocalizedString, code?: string, errorType?: string}) => void) {
-        
+      onWebSocketDisconnect: (connectionLostDetails?: {reason?: string, code?: string, errorType?: string}) => void) {
+
     this.#socket = new WebSocket(url);
     this.#socket.onerror = this.onError.bind(this);
     this.#socket.onopen = this.onOpen.bind(this);
@@ -121,9 +121,9 @@ export class WebSocketConnection implements ProtocolClient.InspectorBackend.Conn
     this.#onDisconnect = onDisconnect;
   }
 
-  private onError(ev: Event): void {
+  private onError(event: Event): void {
     if (this.#onWebSocketDisconnect) {
-      this.#onWebSocketDisconnect.call(null, {reason: i18nString(UIStrings.websocketDisconnected)});
+      this.#onWebSocketDisconnect.call(null, {reason: i18nString(UIStrings.websocketDisconnected), errorType: event.type});
     }
     if (this.#onDisconnect) {
       // This is called if error occurred while connecting.
@@ -143,9 +143,9 @@ export class WebSocketConnection implements ProtocolClient.InspectorBackend.Conn
     this.#messages = [];
   }
 
-  private onClose(ev: CloseEvent): void {
+  private onClose(event: CloseEvent): void {
     if (this.#onWebSocketDisconnect) {
-      this.#onWebSocketDisconnect.call(null, {reason: i18nString(UIStrings.websocketDisconnected)});
+      this.#onWebSocketDisconnect.call(null, {reason: event.reason, code: String(event.code || 0)});
     }
     if (this.#onDisconnect) {
       this.#onDisconnect.call(null, 'websocket closed');
@@ -279,21 +279,29 @@ export class ParallelConnection implements ParallelConnectionInterface {
 
 export async function initMainConnection(
     createRootTarget: () => Promise<void>,
-    onConnectionLost: (connectionLostDetails?: {reason?: Platform.UIString.LocalizedString, code?: string, errorType?: string}) => void): Promise<void> {
+    onConnectionLost: (connectionLostDetails?: {reason?: string, code?: string, errorType?: string}) => void): Promise<void> {
   ProtocolClient.InspectorBackend.Connection.setFactory(createMainConnection.bind(null, onConnectionLost));
   await createRootTarget();
   Host.InspectorFrontendHost.InspectorFrontendHostInstance.connectionReady();
 }
 
-function createMainConnection(onConnectionLost: (connectionLostDetails?: {reason?: Platform.UIString.LocalizedString, code?: string, errorType?: string}) => void):
+function createMainConnection(onConnectionLost: (connectionLostDetails?: {reason?: string, code?: string, errorType?: string}) => void):
     ProtocolClient.InspectorBackend.Connection {
   if (Root.Runtime.getPathName().includes('rehydrated_devtools_app')) {
     return new RehydratingConnection(onConnectionLost);
   }
   const wsParam = Root.Runtime.Runtime.queryParam('ws');
   const wssParam = Root.Runtime.Runtime.queryParam('wss');
   if (wsParam || wssParam) {
-    const ws = (wsParam ? `ws://${wsParam}` : `wss://${wssParam}`) as Platform.DevToolsPath.UrlString;
+    const scheme = wsParam ? 'ws' : 'wss';
+    // ws[s]Param is either:
+    // 1. The hierarchical part of a URL (with the scheme and :// removed).
+    // 2. A path-absolute URL (beginning with `/`) relative to the current host. This is only meaningful in hosted mode.
+    let schemelessUrl = (wsParam ? wsParam : wssParam) as string;
+    if (Host.InspectorFrontendHost.InspectorFrontendHostInstance.isHostedMode() && schemelessUrl.startsWith('/')) {
+      schemelessUrl = `${window.location.host}${schemelessUrl}`;
+    }
+    const ws = `${scheme}://${schemelessUrl}` as Platform.DevToolsPath.UrlString;
     return new WebSocketConnection(ws, onConnectionLost);
   }
   if (Host.InspectorFrontendHost.InspectorFrontendHostInstance.isHostedMode()) {

front_end/core/root/Runtime.ts

@@ -3,12 +3,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import * as Host from '../../core/host/host.js';
 import type * as ProtocolProxyApi from '../../generated/protocol-proxy-api.js';
 import type * as Protocol from '../../generated/protocol.js';
 
-import * as Host from '../../core/host/host.js';
-import {Capability, type Target} from './Target.js';
 import {SDKModel} from './SDKModel.js';
+import type {Target} from './Target.js';
 
 export class ReactNativeApplicationModel extends SDKModel<EventTypes> implements ProtocolProxyApi.ReactNativeApplicationDispatcher {
   #enabled: boolean;
@@ -49,14 +49,14 @@ export class ReactNativeApplicationModel extends SDKModel<EventTypes> implements
 
   metadataUpdated(metadata: Protocol.ReactNativeApplication.MetadataUpdatedEvent): void {
     this.metadataCached = metadata;
-    this.dispatchEventToListeners(Events.MetadataUpdated, metadata);
+    this.dispatchEventToListeners(Events.METADATA_UPDATED, metadata);
   }
 }
 
 export const enum Events {
-  MetadataUpdated = 'MetadataUpdated',
+  METADATA_UPDATED = 'MetadataUpdated',
 }
 
-export type EventTypes = {
-  [Events.MetadataUpdated]: Protocol.ReactNativeApplication.MetadataUpdatedEvent,
-};
+export interface EventTypes {
+  [Events.METADATA_UPDATED]: Protocol.ReactNativeApplication.MetadataUpdatedEvent;
+}