DevTools: wrap DebuggerAgent.Location with DebuggerModel.Location.

Source/devtools/front_end/RuntimeModel.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.
  */
 
 /**
  * @constructor
- * @extends {WebInspector.Object}
+ * @extends {WebInspector.TargetAwareObject}
  * @param {!WebInspector.Target} target
  */
 WebInspector.RuntimeModel = function(target)
 {
+    WebInspector.TargetAwareObject.call(this, target);
+
     target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.FrameAdded, this._frameAdded, this);
     target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.FrameNavigated, this._frameNavigated, this);
     target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.FrameDetached, this._frameDetached, this);
     target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.CachedResourcesLoaded, this._didLoadCachedResources, this);
-    this._target = target;
     this._debuggerModel = target.debuggerModel;
     this._agent = target.runtimeAgent();
     this._contextListById = {};
 }
 
 WebInspector.RuntimeModel.Events = {
     ExecutionContextListAdded: "ExecutionContextListAdded",
     ExecutionContextListRemoved: "ExecutionContextListRemoved",
 }
 
 WebInspector.RuntimeModel.prototype = {
 
     /**
      * @param {string} url
      */
     addWorkerContextList: function(url)
     {
-        console.assert(this._target.isWorkerTarget(), "Worker context list was added in a non-worker target");
+        console.assert(this.target().isWorkerTarget(), "Worker context list was added in a non-worker target");
         var fakeContextList = new WebInspector.WorkerExecutionContextList("worker", url);
         this._addContextList(fakeContextList);
         var fakeExecutionContext = new WebInspector.ExecutionContext(undefined, url, true);
         fakeContextList._addExecutionContext(fakeExecutionContext);
     },
 
     /**
      * @param {?WebInspector.ExecutionContext} executionContext
      */
     setCurrentExecutionContext: function(executionContext)
@@ skipping 24 matching lines @@
     contextListByFrame: function(frame)
     {
         return this._contextListById[frame.id];
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _frameAdded: function(event)
     {
-        console.assert(!this._target.isWorkerTarget() ,"Frame was added in a worker target.t");
+        console.assert(!this.target().isWorkerTarget() ,"Frame was added in a worker target.t");
         var frame = /** @type {!WebInspector.ResourceTreeFrame} */ (event.data);
         var contextList = new WebInspector.FrameExecutionContextList(frame);
         this._addContextList(contextList);
     },
 
     _addContextList: function(executionContextList)
     {
         this._contextListById[executionContextList.id()] = executionContextList;
         this.dispatchEventToListeners(WebInspector.RuntimeModel.Events.ExecutionContextListAdded, executionContextList);
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _frameNavigated: function(event)
     {
-        console.assert(!this._target.isWorkerTarget() ,"Frame was navigated in worker's target");
+        console.assert(!this.target().isWorkerTarget() ,"Frame was navigated in worker's target");
         var frame = /** @type {!WebInspector.ResourceTreeFrame} */ (event.data);
         var context = this._contextListById[frame.id];
         if (context)
             context._frameNavigated(frame);
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _frameDetached: function(event)
     {
-        console.assert(!this._target.isWorkerTarget() ,"Frame was detached in worker's target");
+        console.assert(!this.target().isWorkerTarget() ,"Frame was detached in worker's target");
         var frame = /** @type {!WebInspector.ResourceTreeFrame} */ (event.data);
         var context = this._contextListById[frame.id];
         if (!context)
             return;
         this.dispatchEventToListeners(WebInspector.RuntimeModel.Events.ExecutionContextListRemoved, context);
         delete this._contextListById[frame.id];
     },
 
     _didLoadCachedResources: function()
     {
-        this._target.registerRuntimeDispatcher(new WebInspector.RuntimeDispatcher(this));
+        this.target().registerRuntimeDispatcher(new WebInspector.RuntimeDispatcher(this));
         this._agent.enable();
     },
 
     _executionContextCreated: function(context)
     {
         var contextList = this._contextListById[context.frameId];
         console.assert(contextList);
         contextList._addExecutionContext(new WebInspector.ExecutionContext(context.id, context.name, context.isPageContext));
     },
 
@@ skipping 27 matching lines @@
         function evalCallback(error, result, wasThrown)
         {
             if (error) {
                 callback(null, false);
                 return;
             }
 
             if (returnByValue)
                 callback(null, !!wasThrown, wasThrown ? null : result);
             else
-                callback(this._target.runtimeModel.createRemoteObject(result), !!wasThrown);
+                callback(this.target().runtimeModel.createRemoteObject(result), !!wasThrown);
         }
         this._agent.evaluate(expression, objectGroup, includeCommandLineAPI, doNotPauseOnExceptionsAndMuteConsole, this._currentExecutionContext ? this._currentExecutionContext.id : undefined, returnByValue, generatePreview, evalCallback.bind(this));
     },
 
     /**
      * @param {!Element} proxyElement
      * @param {!Range} wordRange
      * @param {boolean} force
      * @param {function(!Array.<string>, number=)} completionsReadyCallback
      */
@@ skipping 166 matching lines @@
         }
         completionsReadyCallback(results);
     },
 
     /**
      * @return {!WebInspector.RemoteObject}
      */
     createRemoteObject: function(payload)
     {
         console.assert(typeof payload === "object", "Remote object payload should only be an object");
-        return new WebInspector.RemoteObjectImpl(this._target, payload.objectId, payload.type, payload.subtype, payload.value, payload.description, payload.preview);
+        return new WebInspector.RemoteObjectImpl(this.target(), payload.objectId, payload.type, payload.subtype, payload.value, payload.description, payload.preview);
     },
 
     /**
      * @param {number|string|boolean} value
      * @return {!WebInspector.RemoteObject}
      */
     createRemoteObjectFromPrimitiveValue: function(value)
     {
-        return new WebInspector.RemoteObjectImpl(this._target, undefined, typeof value, undefined, value);
+        return new WebInspector.RemoteObjectImpl(this.target(), undefined, typeof value, undefined, value);
     },
 
     /**
      * @param {string} name
      * @param {string} value
      * @return {!WebInspector.RemoteObjectProperty}
      */
     createRemotePropertyFromPrimitiveValue: function(name, value)
     {
         return new WebInspector.RemoteObjectProperty(name, this.createRemoteObjectFromPrimitiveValue(value));
     },
 
     /**
      * @param {!RuntimeAgent.RemoteObject} payload
      * @param {!WebInspector.ScopeRef=} scopeRef
      * @return {!WebInspector.RemoteObject}
      */
     createScopedObject: function(payload, scopeRef)
     {
         if (scopeRef)
-            return new WebInspector.ScopeRemoteObject(this._target, payload.objectId, scopeRef, payload.type, payload.subtype, payload.value, payload.description, payload.preview);
+            return new WebInspector.ScopeRemoteObject(this.target(), payload.objectId, scopeRef, payload.type, payload.subtype, payload.value, payload.description, payload.preview);
         else
-            return new WebInspector.RemoteObjectImpl(this._target, payload.objectId, payload.type, payload.subtype, payload.value, payload.description, payload.preview);
+            return new WebInspector.RemoteObjectImpl(this.target(), payload.objectId, payload.type, payload.subtype, payload.value, payload.description, payload.preview);
     },
 
-    __proto__: WebInspector.Object.prototype
+    __proto__: WebInspector.TargetAwareObject.prototype
 }
 
 /**
  * @type {!WebInspector.RuntimeModel}
  */
 WebInspector.runtimeModel;
 
 /**
  * @constructor
  * @implements {RuntimeAgent.Dispatcher}
@@ skipping 211 matching lines @@
     /**
      * @return {string}
      */
     displayName: function()
     {
         return this._url;
     },
 
     __proto__: WebInspector.ExecutionContextList.prototype
 }