DevTools: kill DebuggerWorkspaceBinding.{push,pop,set}SourceMapping

third_party/WebKit/Source/devtools/front_end/snippets/ScriptSnippetModel.js

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 12 matching lines @@
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /**
  * @unrestricted
  * @implements {SDK.SDKModelObserver<!SDK.DebuggerModel>}
+ * @implements {Bindings.DebuggerSourceMapping}
  */
 Snippets.ScriptSnippetModel = class extends Common.Object {
   /**
    * @param {!Workspace.Workspace} workspace
    */
   constructor(workspace) {
     super();
     this._workspace = workspace;
     /** @type {!Object.<string, !Workspace.UISourceCode>} */
     this._uiSourceCodeForSnippetId = {};
     /** @type {!Map.<!Workspace.UISourceCode, string>} */
     this._snippetIdForUISourceCode = new Map();
 
     /** @type {!Map.<!SDK.DebuggerModel, !Snippets.SnippetScriptMapping>} */
     this._mappingForDebuggerModel = new Map();
     this._snippetStorage = new Snippets.SnippetStorage('script', 'Script snippet #');
     this._lastSnippetEvaluationIndexSetting = Common.settings.createSetting('lastSnippetEvaluationIndex', 0);
     this._project = new Snippets.SnippetsProject(workspace, this);
     this._loadSnippets();
     SDK.targetManager.observeModels(SDK.DebuggerModel, this);
+    Bindings.debuggerWorkspaceBinding.addSourceMapping(this);
   }
 
   /**
    * @override
    * @param {!SDK.DebuggerModel} debuggerModel
    */
   modelAdded(debuggerModel) {
     this._mappingForDebuggerModel.set(debuggerModel, new Snippets.SnippetScriptMapping(debuggerModel, this));
   }
 
   /**
    * @override
    * @param {!SDK.DebuggerModel} debuggerModel
    */
   modelRemoved(debuggerModel) {
     this._mappingForDebuggerModel.remove(debuggerModel);
   }
 
   /**
+   * @override
+   * @param {!SDK.DebuggerModel.Location} rawLocation
+   * @return {?Workspace.UILocation}
+   */
+  rawLocationToUILocation(rawLocation) {
+    var mapping = this._mappingForDebuggerModel.get(rawLocation.debuggerModel);
+    if (!mapping)
+      return null;
+    return mapping.rawLocationToUILocation(rawLocation);
+  }
+
+  /**
+   * @override
+   * @param {!Workspace.UISourceCode} uiSourceCode
+   * @param {number} lineNumber
+   * @param {number} columnNumber
+   * @return {?SDK.DebuggerModel.Location}
+   */
+  uiLocationToRawLocation(uiSourceCode, lineNumber, columnNumber) {
+    for (var mapping of this._mappingForDebuggerModel.values()) {
+      var rawLocation = mapping.uiLocationToRawLocation(uiSourceCode, lineNumber, columnNumber);
+      if (rawLocation)
+        return rawLocation;
+    }
+    return null;
+  }
+
+  /**
    * @param {!SDK.DebuggerModel} debuggerModel
    * @return {!Snippets.SnippetScriptMapping|undefined}
    */
   snippetScriptMapping(debuggerModel) {
     return this._mappingForDebuggerModel.get(debuggerModel);
   }
 
   /**
    * @return {!Workspace.Project}
    */
@@ skipping 248 matching lines @@
       return null;
     var splitURL = sourceURL.substring(snippetPrefix.length).split('_');
     var snippetId = splitURL[0];
     return snippetId;
   }
 };
 
 Snippets.ScriptSnippetModel.snippetSourceURLPrefix = 'snippets:///';
 
 /**
  * @implements {Bindings.DebuggerSourceMapping}

[dgozman, 2017/06/08 22:25:16]

Remove

[lushnikov, 2017/06/08 22:34:25]

Done.

  * @unrestricted
  */
 Snippets.SnippetScriptMapping = class {
   /**
    * @param {!SDK.DebuggerModel} debuggerModel
    * @param {!Snippets.ScriptSnippetModel} scriptSnippetModel
    */
   constructor(debuggerModel, scriptSnippetModel) {
     this._debuggerModel = debuggerModel;
     this._scriptSnippetModel = scriptSnippetModel;
@@ skipping 79 matching lines @@
 
     return this._debuggerModel.createRawLocation(script, lineNumber, columnNumber);
   }
 
   /**
    * @param {!SDK.Script} script
    * @param {!Workspace.UISourceCode} uiSourceCode
    */
   _addScript(script, uiSourceCode) {
     console.assert(!this._scriptForUISourceCode.get(uiSourceCode));
-    Bindings.debuggerWorkspaceBinding.setSourceMapping(this._debuggerModel, uiSourceCode, this);
     this._uiSourceCodeForScriptId[script.scriptId] = uiSourceCode;
     this._scriptForUISourceCode.set(uiSourceCode, script);
-    Bindings.debuggerWorkspaceBinding.pushSourceMapping(script, this);
+    Bindings.debuggerWorkspaceBinding.updateLocations(script);
   }
 
   /**
    * @param {!Workspace.UISourceCode} uiSourceCode
    * @param {!Array.<!{breakpoint: !Bindings.BreakpointManager.Breakpoint, uiLocation: !Workspace.UILocation}>} breakpointLocations
    */
   _restoreBreakpoints(uiSourceCode, breakpointLocations) {
     var script = this._scriptForUISourceCode.get(uiSourceCode);
     if (!script)
       return;
     var rawLocation =
         /** @type {!SDK.DebuggerModel.Location} */ (this._debuggerModel.createRawLocation(script, 0, 0));
     var scriptUISourceCode = Bindings.debuggerWorkspaceBinding.rawLocationToUILocation(rawLocation).uiSourceCode;
     if (scriptUISourceCode)
       this._scriptSnippetModel._restoreBreakpoints(scriptUISourceCode, breakpointLocations);
   }
-
-  /**
-   * @override
-   * @return {boolean}
-   */
-  isIdentity() {
-    return false;
-  }
-
-  /**
-   * @override
-   * @param {!Workspace.UISourceCode} uiSourceCode
-   * @param {number} lineNumber
-   * @return {boolean}
-   */
-  uiLineHasMapping(uiSourceCode, lineNumber) {
-    return true;
-  }
 };
 
 /**
  * @implements {Common.ContentProvider}
  * @unrestricted
  */
 Snippets.SnippetContentProvider = class {
   /**
    * @param {!Snippets.Snippet} snippet
    */
@@ skipping 121 matching lines @@
    */
   deleteFile(uiSourceCode) {
     this._model.deleteScriptSnippet(uiSourceCode);
   }
 };
 
 /**
  * @type {!Snippets.ScriptSnippetModel}
  */
 Snippets.scriptSnippetModel = new Snippets.ScriptSnippetModel(Workspace.workspace);