chrome-devtools-frontend 1.0.1532884 → 1.0.1534251

package/front_end/core/protocol_client/InspectorBackend.ts

@@ -75,7 +75,6 @@ interface CallbackWithDebugInfo {
 
 export class InspectorBackend {
   readonly agentPrototypes = new Map<ProtocolDomainName, AgentPrototype>();
-  #initialized = false;
   #eventParameterNamesForDomain = new Map<ProtocolDomainName, EventParameterNames>();
   readonly typeMap = new Map<QualifiedName, CommandParameter[]>();
   readonly enumMap = new Map<QualifiedName, Record<string, string>>();
@@ -114,10 +113,6 @@ export class InspectorBackend {
     console.warn(error + ': ' + JSON.stringify(messageObject));
   }
 
-  isInitialized(): boolean {
-    return this.#initialized;
-  }
-
   private agentPrototype(domain: ProtocolDomainName): AgentPrototype {
     let prototype = this.agentPrototypes.get(domain);
     if (!prototype) {
@@ -131,7 +126,6 @@ export class InspectorBackend {
       void {
     const [domain, command] = splitQualifiedName(method);
     this.agentPrototype(domain as ProtocolDomainName).registerCommand(command, parameters, replyArgs, description);
-    this.#initialized = true;
   }
 
   registerEnum(type: QualifiedName, values: Record<string, string>): void {
@@ -145,19 +139,16 @@ export class InspectorBackend {
     // @ts-expect-error globalThis global namespace pollution
     globalThis.Protocol[domain][name] = values;
     this.enumMap.set(type, values);
-    this.#initialized = true;
   }
 
   registerType(method: QualifiedName, parameters: CommandParameter[]): void {
     this.typeMap.set(method, parameters);
-    this.#initialized = true;
   }
 
   registerEvent(eventName: QualifiedName, params: string[]): void {
     const domain = eventName.split('.')[0];
     const eventParameterNames = this.getOrCreateEventParameterNamesForDomain(domain as ProtocolDomainName);
     eventParameterNames.set(eventName, params);
-    this.#initialized = true;
   }
 }
 
@@ -191,14 +182,13 @@ export const test = {
    * Set to get notified about any messages sent over protocol.
    */
   onMessageSent: null as
-          ((message: {domain: string, method: string, params: Object, id: number, sessionId?: string},
-            target: TargetBase|null) => void) |
+          ((message: {domain: string, method: string, params: Object, id: number, sessionId?: string}) => void) |
       null,
 
   /**
    * Set to get notified about any messages received over protocol.
    */
-  onMessageReceived: null as ((message: Object, target: TargetBase|null) => void) | null,
+  onMessageReceived: null as ((message: Object) => void) | null,
 };
 
 const LongPollingMethods = new Set<string>(['CSS.takeComputedStyleUpdates']);
@@ -257,14 +247,6 @@ export class SessionRouter {
     this.#sessions.delete(sessionId);
   }
 
-  private getTargetBySessionId(sessionId: string): TargetBase|null {
-    const session = this.#sessions.get(sessionId ? sessionId : '');
-    if (!session) {
-      return null;
-    }
-    return session.target;
-  }
-
   private nextMessageId(): number {
     return this.#lastMessageId++;
   }
@@ -293,9 +275,7 @@ export class SessionRouter {
 
     if (test.onMessageSent) {
       const paramsObject = JSON.parse(JSON.stringify(params || {}));
-      test.onMessageSent(
-          {domain, method, params: (paramsObject as Object), id: messageId, sessionId},
-          this.getTargetBySessionId(sessionId));
+      test.onMessageSent({domain, method, params: (paramsObject as Object), id: messageId, sessionId});
     }
 
     ++this.#pendingResponsesCount;
@@ -324,7 +304,7 @@ export class SessionRouter {
 
     if (test.onMessageReceived) {
       const messageObjectCopy = JSON.parse((typeof message === 'string') ? message : JSON.stringify(message));
-      test.onMessageReceived(messageObjectCopy, this.getTargetBySessionId(messageObjectCopy.sessionId));
+      test.onMessageReceived(messageObjectCopy);
     }
 
     const messageObject = ((typeof message === 'string') ? JSON.parse(message) : message) as Message;

package/front_end/core/root/Runtime.ts

@@ -404,8 +404,6 @@ export interface HostConfigAiAssistancePerformanceAgent {
   temperature: number;
   enabled: boolean;
   userTier: string;
-  // Introduced in crrev.com/c/6243415
-  insightsEnabled?: boolean;
   featureName?: string;
 }
 

package/front_end/core/sdk/CSSMatchedStyles.ts

@@ -24,7 +24,7 @@ import {
   CustomFunctionMatcher,
   defaultValueForCSSType,
   EnvFunctionMatcher,
-  FlexGridMatcher,
+  FlexGridMasonryMatcher,
   GridTemplateMatcher,
   LengthMatcher,
   LightDarkColorMatcher,
@@ -939,7 +939,7 @@ export class CSSMatchedStyles {
       new LinearGradientMatcher(),
       new AnchorFunctionMatcher(),
       new PositionAnchorMatcher(),
-      new FlexGridMatcher(),
+      new FlexGridMasonryMatcher(),
       new PositionTryMatcher(),
       new LengthMatcher(),
       new MathFunctionMatcher(),

package/front_end/core/sdk/CSSPropertyParserMatchers.ts

@@ -1,7 +1,7 @@
 // Copyright 2023 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-/* eslint-disable rulesdir/no-imperative-dom-api */
+/* eslint-disable @devtools/no-imperative-dom-api */
 
 import * as Common from '../../core/common/common.js';
 import type * as Platform from '../../core/platform/platform.js';
@@ -1072,21 +1072,28 @@ export class CustomFunctionMatcher extends matcherBase(CustomFunctionMatch) {
   }
 }
 
-export class FlexGridMatch implements Match {
-  constructor(readonly text: string, readonly node: CodeMirror.SyntaxNode, readonly isFlex: boolean) {
+export const enum LayoutType {
+  FLEX = 'flex',
+  GRID = 'grid',
+  MASONRY = 'masonry'
+}
+
+export class FlexGridMasonryMatch implements Match {
+  constructor(readonly text: string, readonly node: CodeMirror.SyntaxNode, readonly layoutType: LayoutType) {
   }
 }
 
 // clang-format off
-export class FlexGridMatcher extends matcherBase(FlexGridMatch) {
+export class FlexGridMasonryMatcher extends matcherBase(FlexGridMasonryMatch) {
   // clang-format on
   static readonly FLEX = ['flex', 'inline-flex', 'block flex', 'inline flex'];
   static readonly GRID = ['grid', 'inline-grid', 'block grid', 'inline grid'];
+  static readonly MASONRY = ['masonry', 'inline-masonry', 'block masonry', 'inline masonry'];
   override accepts(propertyName: string): boolean {
     return propertyName === 'display';
   }
 
-  override matches(node: CodeMirror.SyntaxNode, matching: BottomUpTreeMatching): FlexGridMatch|null {
+  override matches(node: CodeMirror.SyntaxNode, matching: BottomUpTreeMatching): FlexGridMasonryMatch|null {
     if (node.name !== 'Declaration') {
       return null;
     }
@@ -1098,11 +1105,14 @@ export class FlexGridMatcher extends matcherBase(FlexGridMatch) {
                        .map(node => matching.getComputedText(node).trim())
                        .filter(value => value);
     const text = values.join(' ');
-    if (FlexGridMatcher.FLEX.includes(text)) {
-      return new FlexGridMatch(matching.ast.text(node), node, true);
+    if (FlexGridMasonryMatcher.FLEX.includes(text)) {
+      return new FlexGridMasonryMatch(matching.ast.text(node), node, LayoutType.FLEX);
+    }
+    if (FlexGridMasonryMatcher.GRID.includes(text)) {
+      return new FlexGridMasonryMatch(matching.ast.text(node), node, LayoutType.GRID);
     }
-    if (FlexGridMatcher.GRID.includes(text)) {
-      return new FlexGridMatch(matching.ast.text(node), node, false);
+    if (FlexGridMasonryMatcher.MASONRY.includes(text)) {
+      return new FlexGridMasonryMatch(matching.ast.text(node), node, LayoutType.MASONRY);
     }
     return null;
   }

package/front_end/core/sdk/NetworkManager.ts

@@ -1022,9 +1022,15 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
   requestIntercepted({}: Protocol.Network.RequestInterceptedEvent): void {
   }
 
-  requestWillBeSentExtraInfo(
-      {requestId, associatedCookies, headers, clientSecurityState, connectTiming, siteHasCookieInOtherPartition}:
-          Protocol.Network.RequestWillBeSentExtraInfoEvent): void {
+  requestWillBeSentExtraInfo({
+    requestId,
+    associatedCookies,
+    headers,
+    clientSecurityState,
+    connectTiming,
+    siteHasCookieInOtherPartition,
+    appliedNetworkConditionsId
+  }: Protocol.Network.RequestWillBeSentExtraInfoEvent): void {
     const blockedRequestCookies: BlockedCookieWithReason[] = [];
     const includedRequestCookies: IncludedCookieWithReason[] = [];
     for (const {blockedReasons, exemptionReason, cookie} of associatedCookies) {
@@ -1041,6 +1047,7 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
       clientSecurityState,
       connectTiming,
       siteHasCookieInOtherPartition,
+      appliedNetworkConditionsId,
     };
     this.getExtraInfoBuilder(requestId).addRequestExtraInfo(extraRequestInfo);
   }
@@ -1513,22 +1520,6 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
     request.setTrustTokenOperationDoneEvent(event);
   }
 
-  subresourceWebBundleMetadataReceived(): void {
-    // TODO: remove implementation after deleting this methods from definition in Network.pdl
-  }
-
-  subresourceWebBundleMetadataError(): void {
-    // TODO: remove implementation after deleting this methods from definition in Network.pdl
-  }
-
-  subresourceWebBundleInnerResponseParsed(): void {
-    // TODO: remove implementation after deleting this methods from definition in Network.pdl
-  }
-
-  subresourceWebBundleInnerResponseError(): void {
-    // TODO: remove implementation after deleting this methods from definition in Network.pdl
-  }
-
   reportingApiReportAdded(data: Protocol.Network.ReportingApiReportAddedEvent): void {
     this.#manager.dispatchEventToListeners(Events.ReportingApiReportAdded, data.report);
   }
@@ -1575,24 +1566,6 @@ export type RequestConditionsSetting = {
   enabled: boolean,
 };
 
-declare global {
-  // TS typedefs are not up to date
-  interface URLPattern {
-    hash: string;
-    hostname: string;
-    password: string;
-    pathname: string;
-    port: string;
-    protocol: string;
-    search: string;
-    username: string;
-    hasRegExpGroups: boolean;
-    test(url: string): boolean;
-  }
-  /* eslint-disable-next-line @typescript-eslint/naming-convention */
-  var URLPattern: {prototype: URLPattern, new (input: string): URLPattern};
-}
-
 export type URLPatternConstructorString = Platform.Brand.Brand<string, 'URLPatternConstructorString'>;
 
 export const enum RequestURLPatternValidity {
@@ -1650,6 +1623,7 @@ export class RequestCondition extends Common.ObjectWrapper.ObjectWrapper<Request
   #pattern: RequestURLPattern|{wildcardURL: string, upgradedPattern?: RequestURLPattern};
   #enabled: boolean;
   #conditions: ThrottlingConditions;
+  #ruleIds = new Set<string>();
 
   static createFromSetting(setting: RequestConditionsSetting): RequestCondition {
     if ('urlPattern' in setting) {
@@ -1685,6 +1659,14 @@ export class RequestCondition extends Common.ObjectWrapper.ObjectWrapper<Request
     this.#conditions = conditions;
   }
 
+  get isBlocking(): boolean {
+    return this.conditions === BlockingConditions;
+  }
+
+  get ruleIds(): Set<string> {
+    return this.#ruleIds;
+  }
+
   get constructorString(): string|undefined {
     return this.#pattern instanceof RequestURLPattern ? this.#pattern.constructorString :
                                                         this.#pattern.upgradedPattern?.constructorString;
@@ -1731,6 +1713,7 @@ export class RequestCondition extends Common.ObjectWrapper.ObjectWrapper<Request
 
   set conditions(conditions: ThrottlingConditions) {
     this.#conditions = conditions;
+    this.#ruleIds = new Set();
     this.dispatchEventToListeners(RequestCondition.Events.REQUEST_CONDITION_CHANGED);
   }
 
@@ -1766,6 +1749,11 @@ export class RequestConditions extends Common.ObjectWrapper.ObjectWrapper<Reques
   readonly #conditionsEnabledSetting =
       Common.Settings.Settings.instance().moduleSetting<boolean>('request-blocking-enabled');
   readonly #conditions: RequestCondition[] = [];
+  readonly #requestConditionsById = new Map<string, {
+    conditions: Conditions,
+    urlPattern?: string,
+  }>();
+  #conditionsAppliedForTestPromise: Promise<unknown> = Promise.resolve();
 
   constructor() {
     super();
@@ -1871,7 +1859,8 @@ export class RequestConditions extends Common.ObjectWrapper.ObjectWrapper<Reques
     }
     if (Root.Runtime.hostConfig.devToolsIndividualRequestThrottling?.enabled) {
       const urlPatterns: Protocol.Network.BlockPattern[] = [];
-      const matchedNetworkConditions: Protocol.Network.NetworkConditions[] = [];
+      // We store all this info out-of-band to prevent races with changing conditions while the promise is still pending
+      const matchedNetworkConditions: Array<{conditions: Conditions, ruleIds?: Set<string>, urlPattern?: string}> = [];
       if (this.conditionsEnabled) {
         for (const condition of this.#conditions) {
           const urlPattern = condition.constructorString;
@@ -1882,43 +1871,56 @@ export class RequestConditions extends Common.ObjectWrapper.ObjectWrapper<Reques
           const block = !isNonBlockingCondition(conditions);
           urlPatterns.push({urlPattern, block});
           if (!block) {
-            matchedNetworkConditions.push({
-              urlPattern,
-              latency: conditions.latency,
-              downloadThroughput: conditions.download < 0 ? 0 : conditions.download,
-              uploadThroughput: conditions.upload < 0 ? 0 : conditions.upload,
-              packetLoss: (conditions.packetLoss ?? 0) < 0 ? 0 : conditions.packetLoss,
-              packetQueueLength: conditions.packetQueueLength,
-              packetReordering: conditions.packetReordering,
-              connectionType: NetworkManager.connectionType(conditions),
-            });
+            const {ruleIds} = condition;
+            matchedNetworkConditions.push({ruleIds, urlPattern, conditions});
           }
         }
 
         if (globalConditions) {
-          matchedNetworkConditions.push({
-            urlPattern: '',
-            latency: globalConditions.latency,
-            downloadThroughput: globalConditions.download < 0 ? 0 : globalConditions.download,
-            uploadThroughput: globalConditions.upload < 0 ? 0 : globalConditions.upload,
-            packetLoss: (globalConditions.packetLoss ?? 0) < 0 ? 0 : globalConditions.packetLoss,
-            packetQueueLength: globalConditions.packetQueueLength,
-            packetReordering: globalConditions.packetReordering,
-            connectionType: NetworkManager.connectionType(globalConditions),
-          });
+          matchedNetworkConditions.push({conditions: globalConditions});
         }
       }
 
+      const promises: Array<Promise<unknown>> = [];
+
       for (const agent of agents) {
-        void agent.invoke_setBlockedURLs({urlPatterns});
-        void agent.invoke_emulateNetworkConditionsByRule({offline, matchedNetworkConditions});
-        void agent.invoke_overrideNetworkState({
+        promises.push(agent.invoke_setBlockedURLs({urlPatterns}));
+        promises.push(agent
+                          .invoke_emulateNetworkConditionsByRule({
+                            offline,
+                            matchedNetworkConditions: matchedNetworkConditions.map(
+                                ({urlPattern, conditions}) => ({
+                                  urlPattern: urlPattern ?? '',
+                                  latency: conditions.latency,
+                                  downloadThroughput: conditions.download < 0 ? 0 : conditions.download,
+                                  uploadThroughput: conditions.upload < 0 ? 0 : conditions.upload,
+                                  packetLoss: (conditions.packetLoss ?? 0) < 0 ? 0 : conditions.packetLoss,
+                                  packetQueueLength: conditions.packetQueueLength,
+                                  packetReordering: conditions.packetReordering,
+                                  connectionType: NetworkManager.connectionType(conditions),
+                                }))
+                          })
+                          .then(response => {
+                            if (!response.getError()) {
+                              for (let i = 0; i < response.ruleIds.length; ++i) {
+                                const ruleId = response.ruleIds[i];
+                                const {ruleIds, conditions, urlPattern} = matchedNetworkConditions[i];
+                                if (ruleIds) {
+                                  this.#requestConditionsById.set(ruleId, {urlPattern, conditions});
+                                  matchedNetworkConditions[i].ruleIds?.add(ruleId);
+                                }
+                              }
+                            }
+                          }));
+        promises.push(agent.invoke_overrideNetworkState({
           offline,
           latency: globalConditions?.latency ?? 0,
           downloadThroughput: !globalConditions || globalConditions.download < 0 ? 0 : globalConditions.download,
           uploadThroughput: !globalConditions || globalConditions.upload < 0 ? 0 : globalConditions.upload,
-        });
+        }));
       }
+
+      this.#conditionsAppliedForTestPromise = this.#conditionsAppliedForTestPromise.then(() => Promise.all(promises));
       return urlPatterns.length > 0;
     }
 
@@ -1932,6 +1934,17 @@ export class RequestConditions extends Common.ObjectWrapper.ObjectWrapper<Reques
     }
     return urls.length > 0;
   }
+
+  conditionsAppliedForTest(): Promise<unknown> {
+    return this.#conditionsAppliedForTestPromise;
+  }
+
+  conditionsForId(appliedNetworkConditionsId: string): {
+    conditions: Conditions,
+    urlPattern?: string,
+  }|undefined {
+    return this.#requestConditionsById.get(appliedNetworkConditionsId);
+  }
 }
 
 export namespace RequestConditions {
@@ -2313,6 +2326,16 @@ export class MultitargetNetworkManager extends Common.ObjectWrapper.ObjectWrappe
           resolve({success, content, errorDescription});
         }, allowRemoteFilePaths));
   }
+
+  appliedRequestConditions(requestInternal: NetworkRequest): {
+    conditions: Conditions,
+    urlPattern?: string,
+  }|undefined {
+    if (!requestInternal.appliedNetworkConditionsId) {
+      return undefined;
+    }
+    return this.requestConditions.conditionsForId(requestInternal.appliedNetworkConditionsId);
+  }
 }
 
 export namespace MultitargetNetworkManager {

package/front_end/core/sdk/NetworkRequest.ts

@@ -319,6 +319,7 @@ export class NetworkRequest extends Common.ObjectWrapper.ObjectWrapper<EventType
   readonly #directSocketChunks: DirectSocketChunk[] = [];
   #isIpProtectionUsed: boolean;
   #isAdRelated: boolean;
+  #appliedNetworkConditionsId?: string;
 
   constructor(
       requestId: string,
@@ -455,6 +456,10 @@ export class NetworkRequest extends Common.ObjectWrapper.ObjectWrapper<EventType
     return this.#loaderId;
   }
 
+  get appliedNetworkConditionsId(): string|undefined {
+    return this.#appliedNetworkConditionsId;
+  }
+
   setRemoteAddress(ip: string, port: number): void {
     this.#remoteAddress = ip + ':' + port;
     this.dispatchEventToListeners(Events.REMOTE_ADDRESS_CHANGED, this);
@@ -1613,6 +1618,7 @@ export class NetworkRequest extends Common.ObjectWrapper.ObjectWrapper<EventType
     this.#hasExtraRequestInfo = true;
     this.setRequestHeadersText('');  // Mark request headers as non-provisional
     this.#clientSecurityState = extraRequestInfo.clientSecurityState;
+    this.#appliedNetworkConditionsId = extraRequestInfo.appliedNetworkConditionsId;
     if (extraRequestInfo.connectTiming) {
       this.setConnectTimingFromExtraInfo(extraRequestInfo.connectTiming);
     }
@@ -2170,6 +2176,7 @@ export interface ExtraRequestInfo {
   clientSecurityState?: Protocol.Network.ClientSecurityState;
   connectTiming: Protocol.Network.ConnectTiming;
   siteHasCookieInOtherPartition?: boolean;
+  appliedNetworkConditionsId?: string;
 }
 
 export interface ExtraResponseInfo {