DevTools: wrap DebuggerAgent.Location with DebuggerModel.Location.

Source/devtools/front_end/DOMModel.js

 /*
  * Copyright (C) 2009, 2010 Google Inc. All rights reserved.
  * Copyright (C) 2009 Joseph Pecoraro
  *
  * 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.
@@ skipping 20 matching lines @@
 
 /**
  * @constructor
  * @extends {WebInspector.TargetAware}
  * @param {!WebInspector.DOMModel} domModel
  * @param {?WebInspector.DOMDocument} doc
  * @param {boolean} isInShadowTree
  * @param {!DOMAgent.Node} payload
  */
 WebInspector.DOMNode = function(domModel, doc, isInShadowTree, payload) {
-    WebInspector.TargetAware.call(this, domModel._target);
+    WebInspector.TargetAware.call(this, domModel.target());
     this._domModel = domModel;
     this._agent = domModel._agent;
     this.ownerDocument = doc;
     this._isInShadowTree = isInShadowTree;
 
     this.id = payload.nodeId;
     domModel._idToDOMNode[this.id] = this;
     this._nodeType = payload.nodeType;
     this._nodeName = payload.nodeName;
     this._localName = payload.localName;
@@ skipping 409 matching lines @@
         function copy(error, text)
         {
             if (!error)
                 InspectorFrontendHost.copyText(text);
         }
         this._agent.getOuterHTML(this.id, copy);
     },
 
     /**
      * @param {string} objectGroupId
-     * @param {function(?Protocol.Error, !Array.<!DOMAgent.EventListener>)=} callback
+     * @param {function(?Array.<!WebInspector.DOMModel.EventListener>)} callback
      */
     eventListeners: function(objectGroupId, callback)
     {
-        this._agent.getEventListenersForNode(this.id, objectGroupId, callback);
+        var target = this.target();
+
+        /**
+         * @param {?Protocol.Error} error
+         * @param {!Array.<!DOMAgent.EventListener>} payloads
+         */
+        function mycallback(error, payloads)
+        {
+            if (error) {
+                callback(null);
+                return;
+            }
+            callback(payloads.map(function(payload) {
+                return new WebInspector.DOMModel.EventListener(target, payload);
+            }));
+        }
+        this._agent.getEventListenersForNode(this.id, objectGroupId, mycallback);
     },
 
     /**
      * @return {string}
      */
     path: function()
     {
         /**
          * @param {?WebInspector.DOMNode} node
          */
@@ skipping 367 matching lines @@
     this.baseURL = payload.baseURL || "";
     this.xmlVersion = payload.xmlVersion;
     this._listeners = {};
 }
 
 WebInspector.DOMDocument.prototype = {
     __proto__: WebInspector.DOMNode.prototype
 }
 
 /**
- * @extends {WebInspector.Object}
  * @constructor
+ * @extends {WebInspector.TargetAwareObject}
  * @param {!WebInspector.Target} target
  */
 WebInspector.DOMModel = function(target) {
-    this._target = target;
+    WebInspector.TargetAwareObject.call(this, target);
+
     this._agent = target.domAgent();
 
     /** @type {!Object.<number, !WebInspector.DOMNode>} */
     this._idToDOMNode = {};
     /** @type {?WebInspector.DOMDocument} */
     this._document = null;
     /** @type {!Object.<number, boolean>} */
     this._attributeLoadNodeIds = {};
     InspectorBackend.registerDOMDispatcher(new WebInspector.DOMDispatcher(this));
 
@@ skipping 665 matching lines @@
     },
 
     /**
      * @param {?WebInspector.DOMNodeHighlighter} highlighter
      */
     setHighlighter: function(highlighter)
     {
         this._highlighter = highlighter || this._defaultHighlighter;
     },
 
-    __proto__: WebInspector.Object.prototype
+    __proto__: WebInspector.TargetAwareObject.prototype
 }
 
 /**
  * @constructor
  * @implements {DOMAgent.Dispatcher}
  * @param {!WebInspector.DOMModel} domModel
  */
 WebInspector.DOMDispatcher = function(domModel)
 {
     this._domModel = domModel;
@@ skipping 117 matching lines @@
      * @param {!DOMAgent.NodeId} parentId
      * @param {!DOMAgent.NodeId} pseudoElementId
      */
     pseudoElementRemoved: function(parentId, pseudoElementId)
     {
         this._domModel._pseudoElementRemoved(parentId, pseudoElementId);
     }
 }
 
 /**
+ * @constructor
+ * @extends {WebInspector.TargetAware}
+ * @param {!WebInspector.Target} target
+ * @param {!DOMAgent.EventListener} payload
+ */
+WebInspector.DOMModel.EventListener = function(target, payload)
+{
+    WebInspector.TargetAware.call(this, target);
+    this._payload = payload;
+}
+
+WebInspector.DOMModel.EventListener.prototype = {
+    /**
+     * @return {!DOMAgent.EventListener}
+     */
+    payload: function()
+    {
+        return this._payload;
+    },
+
+    /**
+     * @return {?WebInspector.DOMNode}
+     */
+    node: function()
+    {
+        return this.target().domModel.nodeForId(this._payload.nodeId);
+    },
+
+    /**
+     * @return {!WebInspector.DebuggerModel.Location}
+     */
+    location: function()
+    {
+        return WebInspector.DebuggerModel.Location.fromPayload(this.target(), this._payload.location);
+    },
+
+    /**
+     * @return {?WebInspector.RemoteObject}
+     */
+    handler: function()
+    {
+        return this._payload.handler ? this.target().runtimeModel.createRemoteObject(this._payload.handler) : null;
+    },
+
+    __proto__: WebInspector.TargetAware.prototype
+}
+
+/**
  * @interface
  */
 WebInspector.DOMNodeHighlighter = function() {
 }
 
 WebInspector.DOMNodeHighlighter.prototype = {
     /**
      * @param {!DOMAgent.NodeId} nodeId
      * @param {!DOMAgent.HighlightConfig} config
      * @param {!RuntimeAgent.RemoteObjectId=} objectId
@@ skipping 42 matching lines @@
     setInspectModeEnabled: function(enabled, inspectUAShadowDOM, config, callback)
     {
         this._agent.setInspectModeEnabled(enabled, inspectUAShadowDOM, config, callback);
     }
 }
 
 /**
  * @type {!WebInspector.DOMModel}
  */
 WebInspector.domModel;