[bindings] Pass CSSWorkspaceBinding via constructor to SASSSourceMapping

R=nvitkov@chromium.org

Bug: 458180550
Change-Id: I22cd81a4987f521040e9bb3ddab80e77f18d3610
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/7165023
Commit-Queue: Simon Zünd <szuend@chromium.org>
Reviewed-by: Nikolay Vitkov <nvitkov@chromium.org>
Commit-Queue: Nikolay Vitkov <nvitkov@chromium.org>
Auto-Submit: Simon Zünd <szuend@chromium.org>

Author: szuend

front_end/models/bindings/CSSWorkspaceBinding.ts

@@ -63,7 +63,7 @@ export class CSSWorkspaceBinding implements SDK.TargetManager.SDKModelObserver<S
   }
 
   modelAdded(cssModel: SDK.CSSModel.CSSModel): void {
-    this.#modelToInfo.set(cssModel, new ModelInfo(cssModel, this.#resourceMapping));
+    this.#modelToInfo.set(cssModel, new ModelInfo(cssModel, this.#resourceMapping, this));
   }
 
   modelRemoved(cssModel: SDK.CSSModel.CSSModel): void {
@@ -157,7 +157,8 @@ export class ModelInfo {
   #sassSourceMapping: SASSSourceMapping;
   readonly #locations: Platform.MapUtilities.Multimap<SDK.CSSStyleSheetHeader.CSSStyleSheetHeader, LiveLocation>;
   readonly #unboundLocations: Platform.MapUtilities.Multimap<Platform.DevToolsPath.UrlString, LiveLocation>;
-  constructor(cssModel: SDK.CSSModel.CSSModel, resourceMapping: ResourceMapping) {
+  constructor(
+      cssModel: SDK.CSSModel.CSSModel, resourceMapping: ResourceMapping, cssWorkspaceBinding: CSSWorkspaceBinding) {
     this.#eventListeners = [
       cssModel.addEventListener(
           SDK.CSSModel.Events.StyleSheetAdded,
@@ -176,7 +177,8 @@ export class ModelInfo {
     this.#resourceMapping = resourceMapping;
     this.#stylesSourceMapping = new StylesSourceMapping(cssModel, resourceMapping.workspace);
     const sourceMapManager = cssModel.sourceMapManager();
-    this.#sassSourceMapping = new SASSSourceMapping(cssModel.target(), sourceMapManager, resourceMapping.workspace);
+    this.#sassSourceMapping =
+        new SASSSourceMapping(cssModel.target(), sourceMapManager, resourceMapping.workspace, cssWorkspaceBinding);
 
     this.#locations = new Platform.MapUtilities.Multimap();
     this.#unboundLocations = new Platform.MapUtilities.Multimap();

front_end/models/bindings/SASSSourceMapping.ts

@@ -10,20 +10,22 @@ import * as TextUtils from '../text_utils/text_utils.js';
 import * as Workspace from '../workspace/workspace.js';
 
 import {ContentProviderBasedProject} from './ContentProviderBasedProject.js';
-import {CSSWorkspaceBinding, type SourceMapping} from './CSSWorkspaceBinding.js';
+import type {CSSWorkspaceBinding, SourceMapping} from './CSSWorkspaceBinding.js';
 import {NetworkProject} from './NetworkProject.js';
 
 export class SASSSourceMapping implements SourceMapping {
   readonly #sourceMapManager: SDK.SourceMapManager.SourceMapManager<SDK.CSSStyleSheetHeader.CSSStyleSheetHeader>;
   readonly #project: ContentProviderBasedProject;
   readonly #eventListeners: Common.EventTarget.EventDescriptor[];
   readonly #bindings: Map<string, Binding>;
+  readonly #cssWorkspaceBinding: CSSWorkspaceBinding;
 
   constructor(
       target: SDK.Target.Target,
       sourceMapManager: SDK.SourceMapManager.SourceMapManager<SDK.CSSStyleSheetHeader.CSSStyleSheetHeader>,
-      workspace: Workspace.Workspace.WorkspaceImpl) {
+      workspace: Workspace.Workspace.WorkspaceImpl, cssWorkspaceBinding: CSSWorkspaceBinding) {
     this.#sourceMapManager = sourceMapManager;
+    this.#cssWorkspaceBinding = cssWorkspaceBinding;
     this.#project = new ContentProviderBasedProject(
         workspace, 'cssSourceMaps:' + target.id(), Workspace.Workspace.projectTypes.Network, '',
         false /* isServiceProject */);
@@ -58,7 +60,7 @@ export class SASSSourceMapping implements SourceMapping {
       }
       binding.addSourceMap(sourceMap, header.frameId);
     }
-    await CSSWorkspaceBinding.instance().updateLocations(header);
+    await this.#cssWorkspaceBinding.updateLocations(header);
     this.sourceMapAttachedForTest(sourceMap);
   }
 
@@ -78,7 +80,7 @@ export class SASSSourceMapping implements SourceMapping {
         }
       }
     }
-    await CSSWorkspaceBinding.instance().updateLocations(header);
+    await this.#cssWorkspaceBinding.updateLocations(header);
   }
 
   rawLocationToUILocation(rawLocation: SDK.CSSModel.CSSLocation): Workspace.UISourceCode.UILocation|null {