DevTools: wrap DebuggerAgent.Location with DebuggerModel.Location.

Source/devtools/front_end/CPUProfilerModel.js

 /*
  * Copyright (C) 2014 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:
  *
  * 1. Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *
@@ skipping 10 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.
  */
 
 /**
  * @constructor
- * @extends {WebInspector.Object}
+ * @extends {WebInspector.TargetAwareObject}
+ * @param {!WebInspector.Target} target
  * @implements {ProfilerAgent.Dispatcher}
  */
-WebInspector.CPUProfilerModel = function()
+WebInspector.CPUProfilerModel = function(target)
 {
+    WebInspector.TargetAwareObject.call(this, target);
+
     /** @type {?WebInspector.CPUProfilerModel.Delegate} */
     this._delegate = null;
     this._isRecording = false;
     InspectorBackend.registerProfilerDispatcher(this);
     ProfilerAgent.enable();
 }
 
 WebInspector.CPUProfilerModel.EventTypes = {
     ProfileStarted: "profile-started",
     ProfileStopped: "profile-stopped"
@@ skipping 11 matching lines @@
     /**
      * @param {string} id
      * @param {!DebuggerAgent.Location} scriptLocation
      * @param {!ProfilerAgent.CPUProfile} cpuProfile
      * @param {string=} title
      */
     consoleProfileFinished: function(id, scriptLocation, cpuProfile, title)
     {
         // Make sure ProfilesPanel is initialized and CPUProfileType is created.
         WebInspector.moduleManager.loadModule("profiles");
-        this._delegate.consoleProfileFinished(id, scriptLocation, cpuProfile, title);
+        this._delegate.consoleProfileFinished(id, WebInspector.DebuggerModel.Location.fromPayload(this.target(), scriptLocation), cpuProfile, title);
     },
 
     /**
      * @param {string} id
      * @param {!DebuggerAgent.Location} scriptLocation
      * @param {string=} title
      */
     consoleProfileStarted: function(id, scriptLocation, title)
     {
         // Make sure ProfilesPanel is initialized and CPUProfileType is created.
         WebInspector.moduleManager.loadModule("profiles");
-        this._delegate.consoleProfileStarted(id, scriptLocation, title);
+        this._delegate.consoleProfileStarted(id, WebInspector.DebuggerModel.Location.fromPayload(this.target(), scriptLocation), title);
     },
 
     /**
       * @param {boolean} isRecording
       */
     setRecording: function(isRecording)
     {
         this._isRecording = isRecording;
         this.dispatchEventToListeners(isRecording ?
             WebInspector.CPUProfilerModel.EventTypes.ProfileStarted :
             WebInspector.CPUProfilerModel.EventTypes.ProfileStopped);
     },
 
     /**
       * @return {boolean}
       */
     isRecordingProfile: function()
     {
         return this._isRecording;
     },
 
-    __proto__: WebInspector.Object.prototype
+    __proto__: WebInspector.TargetAwareObject.prototype
 }
 
 /** @interface */
 WebInspector.CPUProfilerModel.Delegate = function() {};
 
 WebInspector.CPUProfilerModel.Delegate.prototype = {
     /**
      * @param {string} protocolId
-     * @param {!DebuggerAgent.Location} scriptLocation
+     * @param {!WebInspector.DebuggerModel.Location} scriptLocation
      * @param {string=} title
      */
     consoleProfileStarted: function(protocolId, scriptLocation, title) {},
 
     /**
      * @param {string} protocolId
-     * @param {!DebuggerAgent.Location} scriptLocation
+     * @param {!WebInspector.DebuggerModel.Location} scriptLocation
      * @param {!ProfilerAgent.CPUProfile} cpuProfile
      * @param {string=} title
      */
     consoleProfileFinished: function(protocolId, scriptLocation, cpuProfile, title) {}
 }
 
 /**
  * @type {!WebInspector.CPUProfilerModel}
  */
 WebInspector.cpuProfilerModel;