Index: Source/devtools/front_end/sdk/RemoteObject.js |
diff --git a/Source/devtools/front_end/sdk/RemoteObject.js b/Source/devtools/front_end/sdk/RemoteObject.js |
index 1a4343b3c79ceabda82356705ae405593cb6a690..c7101f8476e36648edab9c95e9c07022151471f4 100644 |
--- a/Source/devtools/front_end/sdk/RemoteObject.js |
+++ b/Source/devtools/front_end/sdk/RemoteObject.js |
@@ -95,9 +95,9 @@ WebInspector.RemoteObject.prototype = { |
}, |
/** |
- * @param {function(?Array<!WebInspector.EventListener>)} callback |
+ * @return {!Promise<?Array<!WebInspector.EventListener>>} |
*/ |
- getEventListeners: function(callback) |
+ getEventListeners: function() |
{ |
throw "Not implemented"; |
}, |
@@ -391,36 +391,45 @@ WebInspector.RemoteObjectImpl.prototype = { |
/** |
* @override |
- * @param {function(?Array<!WebInspector.EventListener>)} callback |
+ * @return {!Promise<?Array<!WebInspector.EventListener>>} |
*/ |
- getEventListeners: function(callback) |
+ getEventListeners: function() |
{ |
- if (!this._objectId) { |
- callback(null); |
- return; |
- } |
+ return new Promise(getEventListeners.bind(this)); |
/** |
- * @this {!WebInspector.RemoteObject} |
- * @param {?Protocol.Error} error |
- * @param {!Array<!DOMDebuggerAgent.EventListener>} payloads |
+ * @param {function(?)} fulfill |
+ * @param {function(*)} reject |
+ * @this {WebInspector.RemoteObject} |
*/ |
- function mycallback(error, payloads) |
+ function getEventListeners(fulfill, reject) |
{ |
- if (error) { |
- callback(null); |
+ if (!this._objectId) { |
+ reject(null); |
return; |
} |
- callback(payloads.map(createEventListener.bind(this))); |
- } |
- /** |
- * @this {!WebInspector.RemoteObject} |
- * @param {!DOMDebuggerAgent.EventListener} payload |
- */ |
- function createEventListener(payload) |
- { |
- return new WebInspector.EventListener(this._debuggerModel, payload, this._objectId); |
+ /** |
+ * @this {!WebInspector.RemoteObject} |
+ * @param {?Protocol.Error} error |
+ * @param {!Array<!DOMDebuggerAgent.EventListener>} payloads |
+ */ |
+ function mycallback(error, payloads) |
+ { |
+ if (error) { |
+ reject(null); |
+ return; |
+ } |
+ fulfill(payloads.map(createEventListener.bind(this))); |
+ } |
+ /** |
+ * @this {!WebInspector.RemoteObject} |
+ * @param {!DOMDebuggerAgent.EventListener} payload |
+ */ |
+ function createEventListener(payload) |
+ { |
+ return new WebInspector.EventListener(this._debuggerModel, payload, this._objectId); |
+ } |
+ this.target().domdebuggerAgent().getEventListeners(this._objectId, mycallback.bind(this)); |
pfeldman
2015/05/25 16:25:16
move to line 410
kozy
2015/05/25 18:03:31
Done.
|
} |
- this.target().domdebuggerAgent().getEventListeners(this._objectId, mycallback.bind(this)); |
}, |
/** |