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 336 matching lines @@
    */
   constructor(debuggerModel, scriptSnippetModel) {
     this._debuggerModel = debuggerModel;
     this._scriptSnippetModel = scriptSnippetModel;
     /** @type {!Object.<string, !Workspace.UISourceCode>} */
     this._uiSourceCodeForScriptId = {};
     /** @type {!Map.<!Workspace.UISourceCode, !SDK.Script>} */
     this._scriptForUISourceCode = new Map();
     /** @type {!Map.<!Workspace.UISourceCode, number>} */
     this._evaluationIndexForUISourceCode = new Map();
+    Bindings.debuggerWorkspaceBinding.addSourceMapping(this);

[dgozman, 2017/06/08 19:12:00]

Move this to ScriptSnippetModel instead.

[lushnikov, 2017/06/08 21:14:34]

Done.

     debuggerModel.addEventListener(SDK.DebuggerModel.Events.GlobalObjectCleared, this._reset, this);
   }
 
   /**
    * @param {!Workspace.UISourceCode} uiSourceCode
    */
   _releaseSnippetScript(uiSourceCode) {
     var script = this._scriptForUISourceCode.get(uiSourceCode);
     if (!script)
       return;
@@ skipping 63 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);