chrome-devtools-frontend 1.0.1705227 → 1.0.1706026

package/front_end/third_party/source-map-scopes-codec/package/src/encode/encoder.js

@@ -14,6 +14,7 @@ const DEFAULT_SCOPE_STATE = {
 const DEFAULT_RANGE_STATE = {
   line: 0,
   column: 0,
+  defSourceIdx: 0,
   defScopeIdx: 0
 };
 export class Encoder {
@@ -30,7 +31,8 @@ export class Encoder {
   };
   #encodedItems = [];
   #currentItem = "";
-  #scopeToCount = new Map();
+  #scopeToLocation = new Map();
+  #currentSourceIdx = 0;
   #scopeCounter = 0;
   constructor(info, names){
     this.#info = info;
@@ -40,22 +42,29 @@ export class Encoder {
     }
   }
   encode() {
-    this.#encodedItems = [];
-    this.#info.scopes.forEach((scope)=>{
-      this.#scopeState.line = 0;
-      this.#scopeState.column = 0;
-      this.#encodeOriginalScope(scope);
+    const encodedScopes = this.#info.scopes.map((scopes, sourceIdx)=>{
+      if (scopes === null) {
+        return null;
+      }
+      this.#encodedItems = [];
+      this.#currentSourceIdx = sourceIdx;
+      this.#scopeCounter = 0;
+      Object.assign(this.#scopeState, DEFAULT_SCOPE_STATE);
+      scopes.forEach((scope)=>this.#encodeOriginalScope(scope));
+      return this.#encodedItems.join(",");
     });
+    this.#encodedItems = [];
     this.#info.ranges.forEach((range)=>{
       this.#encodeGeneratedRange(range);
     });
-    return this.#encodedItems.join(",");
+    return {
+      scopes: encodedScopes,
+      ranges: this.#encodedItems.length > 0 ? [
+        this.#encodedItems.join(",")
+      ] : []
+    };
   }
   #encodeOriginalScope(scope) {
-    if (scope === null) {
-      this.#encodedItems.push(EncodedTag.EMPTY);
-      return;
-    }
     this.#encodeOriginalScopeStart(scope);
     this.#encodeOriginalScopeVariables(scope);
     scope.children.forEach((child)=>this.#encodeOriginalScope(child));
@@ -88,7 +97,10 @@ export class Encoder {
     if (encodedName !== undefined) this.#encodeSigned(encodedName);
     if (encodedKind !== undefined) this.#encodeSigned(encodedKind);
     this.#finishItem();
-    this.#scopeToCount.set(scope, this.#scopeCounter++);
+    this.#scopeToLocation.set(scope, {
+      sourceIdx: this.#currentSourceIdx,
+      scopeIdx: this.#scopeCounter++
+    });
   }
   #encodeOriginalScopeVariables(scope) {
     if (scope.variables.length === 0) return;
@@ -129,22 +141,32 @@ export class Encoder {
     }
     this.#rangeState.line = line;
     this.#rangeState.column = column;
-    let encodedDefinition;
+    let encodedDefSourceIdx;
+    let encodedDefScopeIdx;
     if (range.originalScope) {
-      const definitionIdx = this.#scopeToCount.get(range.originalScope);
-      if (definitionIdx === undefined) {
+      const location = this.#scopeToLocation.get(range.originalScope);
+      if (location === undefined) {
         throw new Error("Unknown OriginalScope for definition!");
       }
       flags |= GeneratedRangeFlags.HAS_DEFINITION;
-      encodedDefinition = definitionIdx - this.#rangeState.defScopeIdx;
-      this.#rangeState.defScopeIdx = definitionIdx;
+      encodedDefSourceIdx = location.sourceIdx - this.#rangeState.defSourceIdx;
+      this.#rangeState.defSourceIdx = location.sourceIdx;
+      encodedDefScopeIdx = encodedDefSourceIdx === 0 ? location.scopeIdx - this.#rangeState.defScopeIdx : location.scopeIdx;
+      this.#rangeState.defScopeIdx = location.scopeIdx;
     }
     if (range.isStackFrame) flags |= GeneratedRangeFlags.IS_STACK_FRAME;
     if (range.isHidden) flags |= GeneratedRangeFlags.IS_HIDDEN;
     this.#encodeTag(EncodedTag.GENERATED_RANGE_START).#encodeUnsigned(flags);
     if (encodedLine > 0) this.#encodeUnsigned(encodedLine);
     this.#encodeUnsigned(encodedColumn);
-    if (encodedDefinition !== undefined) this.#encodeSigned(encodedDefinition);
+    if (encodedDefSourceIdx !== undefined && encodedDefScopeIdx !== undefined) {
+      this.#encodeSigned(encodedDefSourceIdx);
+      if (encodedDefSourceIdx === 0) {
+        this.#encodeSigned(encodedDefScopeIdx);
+      } else {
+        this.#encodeUnsigned(encodedDefScopeIdx);
+      }
+    }
     this.#finishItem();
   }
   #encodeGeneratedRangeSubRangeBindings(range) {

package/front_end/third_party/source-map-scopes-codec/package/src/encode/encoder.js.map

@@ -1 +1 @@
-{"version":3,"file":"encoder.js","sources":["./encoder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"encoder.js","sources":["./encoder.ts"],"names":[],"mappings":"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"}

package/front_end/third_party/source-map-scopes-codec/package/src/encode/encoder.ts

@@ -22,6 +22,7 @@ const DEFAULT_SCOPE_STATE = {
 const DEFAULT_RANGE_STATE = {
   line: 0,
   column: 0,
+  defSourceIdx: 0,
   defScopeIdx: 0,
 };
 
@@ -38,7 +39,11 @@ export class Encoder {
   #encodedItems: string[] = [];
   #currentItem: string = "";
 
-  #scopeToCount = new Map<OriginalScope, number>();
+  #scopeToLocation = new Map<
+    OriginalScope,
+    { sourceIdx: number; scopeIdx: number }
+  >();
+  #currentSourceIdx = 0;
   #scopeCounter = 0;
 
   constructor(info: ScopeInfo, names: string[]) {
@@ -50,26 +55,33 @@ export class Encoder {
     }
   }
 
-  encode(): string {
-    this.#encodedItems = [];
-    this.#info.scopes.forEach((scope) => {
-      this.#scopeState.line = 0;
-      this.#scopeState.column = 0;
-      this.#encodeOriginalScope(scope);
+  encode(): { scopes: (string | null)[]; ranges: string[] } {
+    const encodedScopes = this.#info.scopes.map((scopes, sourceIdx) => {
+      if (scopes === null) {
+        return null;
+      }
+      this.#encodedItems = [];
+      this.#currentSourceIdx = sourceIdx;
+      this.#scopeCounter = 0;
+      Object.assign(this.#scopeState, DEFAULT_SCOPE_STATE);
+      scopes.forEach((scope) => this.#encodeOriginalScope(scope));
+      return this.#encodedItems.join(",");
     });
+
+    this.#encodedItems = [];
     this.#info.ranges.forEach((range) => {
       this.#encodeGeneratedRange(range);
     });
 
-    return this.#encodedItems.join(",");
+    return {
+      scopes: encodedScopes,
+      ranges: this.#encodedItems.length > 0
+        ? [this.#encodedItems.join(",")]
+        : [],
+    };
   }
 
-  #encodeOriginalScope(scope: OriginalScope | null): void {
-    if (scope === null) {
-      this.#encodedItems.push(EncodedTag.EMPTY);
-      return;
-    }
-
+  #encodeOriginalScope(scope: OriginalScope): void {
     this.#encodeOriginalScopeStart(scope);
     this.#encodeOriginalScopeVariables(scope);
     scope.children.forEach((child) => this.#encodeOriginalScope(child));
@@ -112,7 +124,10 @@ export class Encoder {
     if (encodedKind !== undefined) this.#encodeSigned(encodedKind);
     this.#finishItem();
 
-    this.#scopeToCount.set(scope, this.#scopeCounter++);
+    this.#scopeToLocation.set(scope, {
+      sourceIdx: this.#currentSourceIdx,
+      scopeIdx: this.#scopeCounter++,
+    });
   }
 
   #encodeOriginalScopeVariables(scope: OriginalScope) {
@@ -169,17 +184,23 @@ export class Encoder {
     this.#rangeState.line = line;
     this.#rangeState.column = column;
 
-    let encodedDefinition;
+    let encodedDefSourceIdx: number | undefined;
+    let encodedDefScopeIdx: number | undefined;
     if (range.originalScope) {
-      const definitionIdx = this.#scopeToCount.get(range.originalScope);
-      if (definitionIdx === undefined) {
+      const location = this.#scopeToLocation.get(range.originalScope);
+      if (location === undefined) {
         throw new Error("Unknown OriginalScope for definition!");
       }
 
       flags |= GeneratedRangeFlags.HAS_DEFINITION;
 
-      encodedDefinition = definitionIdx - this.#rangeState.defScopeIdx;
-      this.#rangeState.defScopeIdx = definitionIdx;
+      encodedDefSourceIdx = location.sourceIdx - this.#rangeState.defSourceIdx;
+      this.#rangeState.defSourceIdx = location.sourceIdx;
+
+      encodedDefScopeIdx = encodedDefSourceIdx === 0
+        ? location.scopeIdx - this.#rangeState.defScopeIdx
+        : location.scopeIdx;
+      this.#rangeState.defScopeIdx = location.scopeIdx;
     }
 
     if (range.isStackFrame) flags |= GeneratedRangeFlags.IS_STACK_FRAME;
@@ -188,7 +209,16 @@ export class Encoder {
     this.#encodeTag(EncodedTag.GENERATED_RANGE_START).#encodeUnsigned(flags);
     if (encodedLine > 0) this.#encodeUnsigned(encodedLine);
     this.#encodeUnsigned(encodedColumn);
-    if (encodedDefinition !== undefined) this.#encodeSigned(encodedDefinition);
+    if (
+      encodedDefSourceIdx !== undefined && encodedDefScopeIdx !== undefined
+    ) {
+      this.#encodeSigned(encodedDefSourceIdx);
+      if (encodedDefSourceIdx === 0) {
+        this.#encodeSigned(encodedDefScopeIdx);
+      } else {
+        this.#encodeUnsigned(encodedDefScopeIdx);
+      }
+    }
     this.#finishItem();
   }
 

package/front_end/third_party/source-map-scopes-codec/package/src/scopes.ts

@@ -7,9 +7,9 @@
  */
 export interface ScopeInfo {
   /**
-   * The length of {@linkcode scopes} must match the length of "sources" in the source map JSON. Each entry describes the scope tree of the corresponding source file.
+   * The length of {@linkcode scopes} must match the length of "sources" in the source map JSON. Each entry describes the scope trees of the corresponding source file.
    */
-  scopes: (OriginalScope | null)[];
+  scopes: (OriginalScope[] | null)[];
 
   /**
    * The range tree of the generated bundle. Multiple top-level ranges are allowed but must not overlap source position wise.
@@ -191,5 +191,6 @@ export interface SourceMapJson {
   sources: (string | null)[];
   mappings: string;
   names?: string[];
-  scopes?: string;
+  scopes?: (string | null)[];
+  ranges?: string[];
 }

package/front_end/third_party/source-map-scopes-codec/package/src/vlq.js

@@ -39,9 +39,11 @@ export function encodeUnsigned(n) {
 }
 export class TokenIterator {
   #string;
+  #strict;
   #position;
-  constructor(string){
+  constructor(string, strict = false){
     this.#string = string;
+    this.#strict = strict;
     this.#position = 0;
   }
   nextChar() {
@@ -66,13 +68,25 @@ export class TokenIterator {
   nextUnsignedVLQ() {
     let result = 0;
     let shift = 0;
-    let digit = 0;
+    let continuation = 0;
     do {
       const charCode = this.nextCharCode();
-      digit = BASE64_CODES[charCode];
+      const digit = BASE64_CODES[charCode];
+      if (digit === undefined) {
+        // `charCode` is either `NaN` (we ran past the end of a truncated
+        // string) or points outside the base64 alphabet. Either way the
+        // previous digit's continuation bit promised another digit that isn't
+        // there, so the VLQ is truncated/malformed. In lax mode we stop and
+        // keep whatever we decoded so far; in strict mode this is an error.
+        if (this.#strict) {
+          throw new Error("Encountered truncated or malformed VLQ");
+        }
+        break;
+      }
       result += (digit & VLQ_BASE_MASK) << shift;
       shift += VLQ_BASE_SHIFT;
-    }while (digit & VLQ_CONTINUATION_MASK)
+      continuation = digit & VLQ_CONTINUATION_MASK;
+    }while (continuation)
     return result;
   }
   currentChar() {

package/front_end/third_party/source-map-scopes-codec/package/src/vlq.js.map

@@ -1 +1 @@
-{"version":3,"file":"vlq.js","sources":["./vlq.ts"],"names":[],"mappings":"AAAA,4DAA4D;AAC5D,yEAAyE;AACzE,6BAA6B;AAE7B;;;;CAIC,GAED,MAAM,eACJ;AACF,MAAM,eAAe,IAAI,WAAW;AACpC,IAAK,IAAI,QAAQ,GAAG,QAAQ,aAAa,MAAM,EAAE,EAAE,MAAO;EACxD,YAAY,CAAC,aAAa,UAAU,CAAC,OAAO,GAAG;AACjD;AAEA,MAAM,iBAAiB;AACvB,MAAM,gBAAgB,CAAC,KAAK,CAAC,IAAI;AACjC,MAAM,wBAAwB,KAAK;AAEnC,OAAO,SAAS,aAAa,CAAS;EACpC,iDAAiD;EACjD,IAAI,KAAK,IAAI,IAAI,IAAI,IAAI,IAAI;EAC7B,OAAO,eAAe;AACxB;AAEA,OAAO,SAAS,eAAe,CAAS;EACtC,4BAA4B;EAC5B,IAAI,SAAS;EACb,MAAO,KAAM;IACX,6DAA6D;IAC7D,MAAM,QAAQ,IAAI;IAClB,OAAO;IACP,yCAAyC;IACzC,IAAI,MAAM,GAAG;MACX,wCAAwC;MACxC,UAAU,YAAY,CAAC,MAAM;MAC7B;IACF,OAAO;MACL,yEAAyE;MACzE,UAAU,YAAY,CAAC,OAAO,MAAM;IACtC;EACF;EACA,OAAO;AACT;AAEA,OAAO,MAAM;EACF,CAAA,MAAO,CAAS;EACzB,CAAA,QAAS,CAAS;EAElB,YAAY,MAAc,CAAE;IAC1B,IAAI,CAAC,CAAA,MAAO,GAAG;IACf,IAAI,CAAC,CAAA,QAAS,GAAG;EACnB;EAEA,WAAmB;IACjB,OAAO,IAAI,CAAC,CAAA,MAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA,QAAS;EAC3C;EAEA,+EAA+E,GAC/E,eAAuB;IACrB,OAAO,IAAI,CAAC,CAAA,MAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA,QAAS;EAC/C;EAEA,OAAe;IACb,OAAO,IAAI,CAAC,CAAA,MAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA,QAAS;EAC3C;EAEA,UAAmB;IACjB,OAAO,IAAI,CAAC,CAAA,QAAS,GAAG,IAAI,CAAC,CAAA,MAAO,CAAC,MAAM;EAC7C;EAEA,gBAAwB;IACtB,IAAI,SAAS,IAAI,CAAC,eAAe;IAEjC,gBAAgB;IAChB,MAAM,WAAW,SAAS;IAC1B,YAAY;IACZ,OAAO,WAAW,CAAC,SAAS;EAC9B;EAEA,kBAA0B;IACxB,IAAI,SAAS;IACb,IAAI,QAAQ;IACZ,IAAI,QAAQ;IACZ,GAAG;MACD,MAAM,WAAW,IAAI,CAAC,YAAY;MAClC,QAAQ,YAAY,CAAC,SAAS;MAC9B,UAAU,CAAC,QAAQ,aAAa,KAAK;MACrC,SAAS;IACX,QAAS,QAAQ,sBAAuB;IACxC,OAAO;EACT;EAEA,cAAsB;IACpB,OAAO,IAAI,CAAC,CAAA,MAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA,QAAS,GAAG;EAC9C;AACF"}
+{"version":3,"file":"vlq.js","sources":["./vlq.ts"],"names":[],"mappings":"AAAA,4DAA4D;AAC5D,yEAAyE;AACzE,6BAA6B;AAE7B;;;;CAIC,GAED,MAAM,eACJ;AACF,MAAM,eAAe,IAAI,WAAW;AACpC,IAAK,IAAI,QAAQ,GAAG,QAAQ,aAAa,MAAM,EAAE,EAAE,MAAO;EACxD,YAAY,CAAC,aAAa,UAAU,CAAC,OAAO,GAAG;AACjD;AAEA,MAAM,iBAAiB;AACvB,MAAM,gBAAgB,CAAC,KAAK,CAAC,IAAI;AACjC,MAAM,wBAAwB,KAAK;AAEnC,OAAO,SAAS,aAAa,CAAS;EACpC,iDAAiD;EACjD,IAAI,KAAK,IAAI,IAAI,IAAI,IAAI,IAAI;EAC7B,OAAO,eAAe;AACxB;AAEA,OAAO,SAAS,eAAe,CAAS;EACtC,4BAA4B;EAC5B,IAAI,SAAS;EACb,MAAO,KAAM;IACX,6DAA6D;IAC7D,MAAM,QAAQ,IAAI;IAClB,OAAO;IACP,yCAAyC;IACzC,IAAI,MAAM,GAAG;MACX,wCAAwC;MACxC,UAAU,YAAY,CAAC,MAAM;MAC7B;IACF,OAAO;MACL,yEAAyE;MACzE,UAAU,YAAY,CAAC,OAAO,MAAM;IACtC;EACF;EACA,OAAO;AACT;AAEA,OAAO,MAAM;EACF,CAAA,MAAO,CAAS;EAChB,CAAA,MAAO,CAAU;EAC1B,CAAA,QAAS,CAAS;EAElB,YAAY,MAAc,EAAE,SAAS,KAAK,CAAE;IAC1C,IAAI,CAAC,CAAA,MAAO,GAAG;IACf,IAAI,CAAC,CAAA,MAAO,GAAG;IACf,IAAI,CAAC,CAAA,QAAS,GAAG;EACnB;EAEA,WAAmB;IACjB,OAAO,IAAI,CAAC,CAAA,MAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA,QAAS;EAC3C;EAEA,+EAA+E,GAC/E,eAAuB;IACrB,OAAO,IAAI,CAAC,CAAA,MAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA,QAAS;EAC/C;EAEA,OAAe;IACb,OAAO,IAAI,CAAC,CAAA,MAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA,QAAS;EAC3C;EAEA,UAAmB;IACjB,OAAO,IAAI,CAAC,CAAA,QAAS,GAAG,IAAI,CAAC,CAAA,MAAO,CAAC,MAAM;EAC7C;EAEA,gBAAwB;IACtB,IAAI,SAAS,IAAI,CAAC,eAAe;IAEjC,gBAAgB;IAChB,MAAM,WAAW,SAAS;IAC1B,YAAY;IACZ,OAAO,WAAW,CAAC,SAAS;EAC9B;EAEA,kBAA0B;IACxB,IAAI,SAAS;IACb,IAAI,QAAQ;IACZ,IAAI,eAAe;IACnB,GAAG;MACD,MAAM,WAAW,IAAI,CAAC,YAAY;MAClC,MAAM,QAAQ,YAAY,CAAC,SAAS;MACpC,IAAI,UAAU,WAAW;QACvB,iEAAiE;QACjE,gEAAgE;QAChE,sEAAsE;QACtE,oEAAoE;QACpE,oEAAoE;QACpE,IAAI,IAAI,CAAC,CAAA,MAAO,EAAE;UAChB,MAAM,IAAI,MAAM;QAClB;QACA;MACF;MACA,UAAU,CAAC,QAAQ,aAAa,KAAK;MACrC,SAAS;MACT,eAAe,QAAQ;IACzB,QAAS,aAAc;IACvB,OAAO;EACT;EAEA,cAAsB;IACpB,OAAO,IAAI,CAAC,CAAA,MAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA,QAAS,GAAG;EAC9C;AACF"}

package/front_end/third_party/source-map-scopes-codec/package/src/vlq.ts

@@ -47,10 +47,12 @@ export function encodeUnsigned(n: number): string {
 
 export class TokenIterator {
   readonly #string: string;
+  readonly #strict: boolean;
   #position: number;
 
-  constructor(string: string) {
+  constructor(string: string, strict = false) {
     this.#string = string;
+    this.#strict = strict;
     this.#position = 0;
   }
 
@@ -83,13 +85,25 @@ export class TokenIterator {
   nextUnsignedVLQ(): number {
     let result = 0;
     let shift = 0;
-    let digit = 0;
+    let continuation = 0;
     do {
       const charCode = this.nextCharCode();
-      digit = BASE64_CODES[charCode];
+      const digit = BASE64_CODES[charCode];
+      if (digit === undefined) {
+        // `charCode` is either `NaN` (we ran past the end of a truncated
+        // string) or points outside the base64 alphabet. Either way the
+        // previous digit's continuation bit promised another digit that isn't
+        // there, so the VLQ is truncated/malformed. In lax mode we stop and
+        // keep whatever we decoded so far; in strict mode this is an error.
+        if (this.#strict) {
+          throw new Error("Encountered truncated or malformed VLQ");
+        }
+        break;
+      }
       result += (digit & VLQ_BASE_MASK) << shift;
       shift += VLQ_BASE_SHIFT;
-    } while (digit & VLQ_CONTINUATION_MASK);
+      continuation = digit & VLQ_CONTINUATION_MASK;
+    } while (continuation);
     return result;
   }
 

package/front_end/ui/comments/CommentOverlayManager.ts

@@ -299,20 +299,22 @@ export class CommentOverlayManager extends Common.ObjectWrapper.ObjectWrapper<Ev
     return thread;
   }
 
-  #trackElementAncestors(element: Element): void {
+  #trackElementAncestors(element: Element, activeScrollRoots?: Set<ShadowRoot>): void {
     if (!this.#devToolsResizeObserver || !this.#scrollListener) {
       return;
     }
     let current: Element|null = element;
     while (current) {
-      if (this.#resizeObservedElements.has(current)) {
-        break;
-      }
-      this.#devToolsResizeObserver.observe(current);
-      this.#resizeObservedElements.add(current);
-      if (current.parentNode instanceof ShadowRoot && !this.#observedScrollRoots.has(current.parentNode)) {
-        current.parentNode.addEventListener('scroll', this.#scrollListener, {capture: true, passive: true});
-        this.#observedScrollRoots.add(current.parentNode);
+      if (!this.#resizeObservedElements.has(current)) {
+        this.#devToolsResizeObserver.observe(current);
+        this.#resizeObservedElements.add(current);
+      }
+      if (current.parentNode instanceof ShadowRoot) {
+        activeScrollRoots?.add(current.parentNode);
+        if (!this.#observedScrollRoots.has(current.parentNode)) {
+          current.parentNode.addEventListener('scroll', this.#scrollListener, {capture: true, passive: true});
+          this.#observedScrollRoots.add(current.parentNode);
+        }
       }
       current = current.parentElementOrShadowHost();
     }
@@ -425,6 +427,7 @@ export class CommentOverlayManager extends Common.ObjectWrapper.ObjectWrapper<Ev
     const newHighlights: HighlightRectData[] = [];
     const elementPinCounts = new Map<Element, number>();
     const rectCache = new Map<Element, DOMRect>();
+    const activeScrollRoots = new Set<ShadowRoot>();
 
     for (const thread of this.#commentManager.getCommentThreads()) {
       // Non-DOM anchors have their positions managed by their respective panels,
@@ -449,7 +452,7 @@ export class CommentOverlayManager extends Common.ObjectWrapper.ObjectWrapper<Ev
         observer.observe(el);
         this.#observedThreads.add(el);
       }
-      this.#trackElementAncestors(el);
+      this.#trackElementAncestors(el, activeScrollRoots);
 
       const visibleRect = computeVisibleRect(el, undefined, rectCache);
       if (!visibleRect) {
@@ -480,6 +483,15 @@ export class CommentOverlayManager extends Common.ObjectWrapper.ObjectWrapper<Ev
       });
     }
 
+    if (this.#scrollListener) {
+      for (const root of this.#observedScrollRoots) {
+        if (!activeScrollRoots.has(root)) {
+          root.removeEventListener('scroll', this.#scrollListener, {capture: true});
+          this.#observedScrollRoots.delete(root);
+        }
+      }
+    }
+
     this.#pinPositions = newPins;
     this.#highlightRects = newHighlights;
     this.dispatchEventToListeners(Events.POSITIONS_UPDATED, {
@@ -791,6 +803,7 @@ export class CommentOverlayManager extends Common.ObjectWrapper.ObjectWrapper<Ev
    * Debounces rematching of comments across dynamic DOM updates.
    */
   #scheduleRematch(root: Document|Element = document): void {
+    clearClippingAncestorsCache();
     if (this.#mutationRafId === undefined) {
       this.#mutationRafId = requestAnimationFrame(() => {
         this.#mutationRafId = undefined;