DevTools: wrap DebuggerAgent.Location with DebuggerModel.Location.

Source/devtools/front_end/ScriptFormatterEditorAction.js

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @constructor
  * @implements {WebInspector.SourceMapping}
  * @param {!WebInspector.Workspace} workspace
  * @param {!WebInspector.DebuggerModel} debuggerModel
  */
@@ skipping 11 matching lines @@
 }
 
 WebInspector.FormatterScriptMapping.prototype = {
     /**
      * @param {!WebInspector.RawLocation} rawLocation
      * @return {?WebInspector.UILocation}
      */
     rawLocationToUILocation: function(rawLocation)
     {
         var debuggerModelLocation = /** @type {!WebInspector.DebuggerModel.Location} */ (rawLocation);
-        var script = this._debuggerModel.scriptForId(debuggerModelLocation.scriptId);
+        var script = debuggerModelLocation.script();
         var uiSourceCode = this._uiSourceCodes.get(script);
         if (!uiSourceCode)
             return null;
 
         var formatData = this._formatData.get(uiSourceCode);
         if (!formatData)
             return null;
         var mapping = formatData.mapping;
         var lineNumber = debuggerModelLocation.lineNumber;
         var columnNumber = debuggerModelLocation.columnNumber || 0;
@@ skipping 35 matching lines @@
          * @return {boolean}
          */
         function isInlineScript(script)
         {
             return script.isInlineScript();
         }
 
         if (uiSourceCode.contentType() === WebInspector.resourceTypes.Document)
             return this._debuggerModel.scriptsForSourceURL(uiSourceCode.url).filter(isInlineScript);
         if (uiSourceCode.contentType() === WebInspector.resourceTypes.Script) {
-            var rawLocation = uiSourceCode.uiLocationToRawLocation(0, 0);
-            return rawLocation ? [this._debuggerModel.scriptForId(rawLocation.scriptId)] : [];
+            var rawLocation = /** @type {!WebInspector.DebuggerModel.Location} */ (uiSourceCode.uiLocationToRawLocation(0, 0));
+            return rawLocation ? [rawLocation.script()] : [];
         }
         return [];
     },
 
     _init: function()
     {
         /** @type {!Map.<!WebInspector.Script, !WebInspector.UISourceCode>} */
         this._uiSourceCodes = new Map();
         /** @type {!StringMap.<string>} */
         this._formattedPaths = new StringMap();
@@ skipping 277 matching lines @@
     },
 
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      */
     _discardFormattedUISourceCodeScript: function(uiSourceCode)
     {
         this._scriptMapping._discardFormattedUISourceCodeScript(uiSourceCode);
     }
 }