DevTools: Decouple debugger model from UI entities

Source/devtools/front_end/sdk/Script.js

 /*
  * Copyright (C) 2008 Apple 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 32 matching lines @@
     WebInspector.SDKObject.call(this, target);
     this.scriptId = scriptId;
     this.sourceURL = sourceURL;
     this.lineOffset = startLine;
     this.columnOffset = startColumn;
     this.endLine = endLine;
     this.endColumn = endColumn;
     this._isContentScript = isContentScript;
     this.sourceMapURL = sourceMapURL;
     this.hasSourceURL = hasSourceURL;
-    /** @type {!Set.<!WebInspector.Script.Location>} */
-    this._locations = new Set();
-    /** @type {!Array.<!WebInspector.SourceMapping>} */
-    this._sourceMappings = [];
 }
 
 WebInspector.Script.Events = {
     ScriptEdited: "ScriptEdited",
     SourceMapURLAdded: "SourceMapURLAdded",
 }
 
 WebInspector.Script.snippetSourceURLPrefix = "snippets:///";
 
 WebInspector.Script.sourceURLRegex = /\n[\040\t]*\/\/[@#]\ssourceURL=\s*(\S*?)\s*$/mg;
 
 /**
  * @param {string} source
  * @return {string}
  */
 WebInspector.Script._trimSourceURLComment = function(source)
 {
     return source.replace(WebInspector.Script.sourceURLRegex, "");
-},
+}
 
 
 WebInspector.Script.prototype = {
     /**
      * @return {boolean}
      */
     isContentScript: function()
     {
         return this._isContentScript;
     },
@@ skipping 61 matching lines @@
             for (var i = 0; i < searchMatches.length; ++i) {
                 var searchMatch = new WebInspector.ContentProvider.SearchMatch(searchMatches[i].lineNumber, searchMatches[i].lineContent);
                 result.push(searchMatch);
             }
             callback(result || []);
         }
 
         if (this.scriptId) {
             // Script failed to parse.
             this.target().debuggerAgent().searchInContent(this.scriptId, query, caseSensitive, isRegex, innerCallback);
-        } else
+        } else {
             callback([]);
+        }
     },
 
     /**
      * @param {string} source
      * @return {string}
      */
     _appendSourceURLCommentIfNeeded: function(source)
     {
         if (!this.hasSourceURL)
             return source;
@@ skipping 29 matching lines @@
         // We append correct sourceURL to script for consistency only. It's not actually needed for things to work correctly.
         newSource = this._appendSourceURLCommentIfNeeded(newSource);
 
         if (this.scriptId)
             this.target().debuggerAgent().setScriptSource(this.scriptId, newSource, undefined, didEditScriptSource.bind(this));
         else
             callback("Script failed to parse");
     },
 
     /**
+     * @param {number} lineNumber
+     * @param {number=} columnNumber
+     * @return {!WebInspector.DebuggerModel.Location}
+     */
+    rawLocation: function(lineNumber, columnNumber)
+    {
+        return new WebInspector.DebuggerModel.Location(this.target(), this.scriptId, lineNumber, columnNumber || 0);
+    },
+
+    /**
      * @return {boolean}
      */
     isInlineScript: function()
     {
         var startsAtZero = !this.lineOffset && !this.columnOffset;
         return !!this.sourceURL && !startsAtZero;
     },
 
     /**
      * @param {string} sourceMapURL
@@ skipping 26 matching lines @@
      * @return {boolean}
      */
     isFramework: function()
     {
         if (!WebInspector.experimentsSettings.frameworksDebuggingSupport.isEnabled())
             return false;
         var regex = WebInspector.settings.skipStackFramesPattern.asRegExp();
         return regex ? regex.test(this.sourceURL) : false;
     },
 
-    /**
-     * @param {number} lineNumber
-     * @param {number=} columnNumber
-     * @return {!WebInspector.UILocation}
-     */
-    rawLocationToUILocation: function(lineNumber, columnNumber)
-    {
-        var uiLocation;
-        var rawLocation = new WebInspector.DebuggerModel.Location(this.target(), this.scriptId, lineNumber, columnNumber || 0);
-        for (var i = this._sourceMappings.length - 1; !uiLocation && i >= 0; --i)
-            uiLocation = this._sourceMappings[i].rawLocationToUILocation(rawLocation);
-        console.assert(uiLocation, "Script raw location can not be mapped to any ui location.");
-        return /** @type {!WebInspector.UILocation} */ (uiLocation);
-    },
-
-    /**
-     * @param {!WebInspector.SourceMapping} sourceMapping
-     */
-    pushSourceMapping: function(sourceMapping)
-    {
-        this._sourceMappings.push(sourceMapping);
-        this.updateLocations();
-    },
-
-    /**
-     * @return {!WebInspector.SourceMapping}
-     */
-    popSourceMapping: function()
-    {
-        var sourceMapping = this._sourceMappings.pop();
-        this.updateLocations();
-        return sourceMapping;
-    },
-
-    updateLocations: function()
-    {
-        var items = this._locations.values();
-        for (var i = 0; i < items.length; ++i)
-            items[i].update();
-    },
-
-    /**
-     * @param {!WebInspector.DebuggerModel.Location} rawLocation
-     * @param {function(!WebInspector.UILocation):(boolean|undefined)} updateDelegate
-     * @return {!WebInspector.Script.Location}
-     */
-    createLiveLocation: function(rawLocation, updateDelegate)
-    {
-        console.assert(rawLocation.scriptId === this.scriptId);
-        var location = new WebInspector.Script.Location(this, rawLocation, updateDelegate);
-        this._locations.add(location);
-        location.update();
-        return location;
-    },
-
     __proto__: WebInspector.SDKObject.prototype
 }
-
-/**
- * @constructor
- * @extends {WebInspector.LiveLocation}
- * @param {!WebInspector.Script} script
- * @param {!WebInspector.DebuggerModel.Location} rawLocation
- * @param {function(!WebInspector.UILocation):(boolean|undefined)} updateDelegate
- */
-WebInspector.Script.Location = function(script, rawLocation, updateDelegate)
-{
-    WebInspector.LiveLocation.call(this, rawLocation, updateDelegate);
-    this._script = script;
-}
-
-WebInspector.Script.Location.prototype = {
-    /**
-     * @return {!WebInspector.UILocation}
-     */
-    uiLocation: function()
-    {
-        var debuggerModelLocation = /** @type {!WebInspector.DebuggerModel.Location} */ (this.rawLocation());
-        return this._script.rawLocationToUILocation(debuggerModelLocation.lineNumber, debuggerModelLocation.columnNumber);
-    },
-
-    dispose: function()
-    {
-        WebInspector.LiveLocation.prototype.dispose.call(this);
-        this._script._locations.remove(this);
-    },
-
-    __proto__: WebInspector.LiveLocation.prototype
-}