DevTools: Promisify Runtime domain

third_party/WebKit/Source/devtools/front_end/sdk/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 229 matching lines @@
     this._agent.setCustomObjectFormatterEnabled(enabled);
   }
 
   /**
    * @param {string} expression
    * @param {string} sourceURL
    * @param {boolean} persistScript
    * @param {number} executionContextId
    * @param {function(!Protocol.Runtime.ScriptId=, ?Protocol.Runtime.ExceptionDetails=)=} callback
    */
-  compileScript(expression, sourceURL, persistScript, executionContextId, callback) {
-    this._agent.compileScript(expression, sourceURL, persistScript, executionContextId, innerCallback);
+  async compileScript(expression, sourceURL, persistScript, executionContextId, callback) {
+    var response = await this._agent.invoke_compileScript({
+      expression: expression,
+      sourceURL: sourceURL,
+      persistScript: persistScript,
+      executionContextId: executionContextId
+    });
 
-    /**
-     * @param {?Protocol.Error} error
-     * @param {!Protocol.Runtime.ScriptId=} scriptId
-     * @param {?Protocol.Runtime.ExceptionDetails=} exceptionDetails
-     */
-    function innerCallback(error, scriptId, exceptionDetails) {
-      if (error) {
-        console.error(error);
-        return;
-      }
-      if (callback)
-        callback(scriptId, exceptionDetails);
+    if (response[Protocol.Error]) {
+      console.error(response[Protocol.Error]);
+      return;
     }
+    if (callback)
+      callback(response.scriptId, response.exceptionDetails);
   }
 
   /**
    * @param {!Protocol.Runtime.ScriptId} scriptId
    * @param {number} executionContextId
    * @param {string=} objectGroup
    * @param {boolean=} silent
    * @param {boolean=} includeCommandLineAPI
    * @param {boolean=} returnByValue
    * @param {boolean=} generatePreview
    * @param {boolean=} awaitPromise
    * @param {function(?Protocol.Runtime.RemoteObject, ?Protocol.Runtime.ExceptionDetails=)=} callback
    */
-  runScript(
-      scriptId,
-      executionContextId,
-      objectGroup,
-      silent,
-      includeCommandLineAPI,
-      returnByValue,
-      generatePreview,
-      awaitPromise,
-      callback) {
-    this._agent.runScript(
-        scriptId, executionContextId, objectGroup, silent, includeCommandLineAPI, returnByValue, generatePreview,
-        awaitPromise, innerCallback);
+  async runScript(
+      scriptId, executionContextId, objectGroup, silent, includeCommandLineAPI, returnByValue, generatePreview,
+      awaitPromise, callback) {
+    var response = await this._agent.invoke_runScript({
+      scriptId: scriptId,

[pfeldman, 2017/05/24 00:43:32]

Use object shortcuts here and everywhere, only for invoke_*.

[alph, 2017/05/24 01:42:58]

Done.

+      executionContextId: executionContextId,
+      objectGroup: objectGroup,
+      silent: silent,
+      includeCommandLineAPI: includeCommandLineAPI,
+      returnByValue: returnByValue,
+      generatePreview: generatePreview,
+      awaitPromise: awaitPromise
+    });
 
-    /**
-     * @param {?Protocol.Error} error
-     * @param {!Protocol.Runtime.RemoteObject} result
-     * @param {!Protocol.Runtime.ExceptionDetails=} exceptionDetails
-     */
-    function innerCallback(error, result, exceptionDetails) {
-      if (error) {
-        console.error(error);
-        return;
-      }
-      if (callback)
-        callback(result, exceptionDetails);
+    if (response[Protocol.Error]) {
+      console.error(response[Protocol.Error]);
+      return;
     }
+    if (callback)
+      callback(response.result, response.exceptionDetails);
   }
 
   /**
    * @param {!Protocol.Runtime.RemoteObject} payload
    * @param {!Object=} hints
    */
   _inspectRequested(payload, hints) {
     var object = this.createRemoteObject(payload);
 
     if (hints.copyToClipboard) {
@@ skipping 323 matching lines @@
   /**
    * @param {string} expression
    * @param {string} objectGroup
    * @param {boolean} includeCommandLineAPI
    * @param {boolean} silent
    * @param {boolean} returnByValue
    * @param {boolean} generatePreview
    * @param {boolean} userGesture
    * @param {function(?SDK.RemoteObject, !Protocol.Runtime.ExceptionDetails=, string=)} callback
    */
-  _evaluateGlobal(
-      expression,
-      objectGroup,
-      includeCommandLineAPI,
-      silent,
-      returnByValue,
-      generatePreview,
-      userGesture,
-      callback) {
+  async _evaluateGlobal(
+      expression, objectGroup, includeCommandLineAPI, silent, returnByValue, generatePreview, userGesture, callback) {
     if (!expression) {
       // There is no expression, so the completion should happen against global properties.
       expression = 'this';
     }
 
-    /**
-     * @this {SDK.ExecutionContext}
-     * @param {?Protocol.Error} error
-     * @param {!Protocol.Runtime.RemoteObject} result
-     * @param {!Protocol.Runtime.ExceptionDetails=} exceptionDetails
-     */
-    function evalCallback(error, result, exceptionDetails) {
-      if (error) {
-        console.error(error);
-        callback(null, undefined, error);
-        return;
-      }
-      callback(this.runtimeModel.createRemoteObject(result), exceptionDetails);
+    var response = await this.runtimeModel._agent.invoke_evaluate({
+      expression: expression,
+      objectGroup: objectGroup,
+      includeCommandLineAPI: includeCommandLineAPI,
+      silent: silent,
+      contextId: this.id,
+      returnByValue: returnByValue,
+      generatePreview: generatePreview,
+      userGesture: userGesture,
+      awaitPromise: false
+    });
+
+    var error = response[Protocol.Error];
+    if (error) {
+      console.error(error);
+      callback(null, undefined, error);
+      return;
     }
-    this.runtimeModel._agent.evaluate(
-        expression, objectGroup, includeCommandLineAPI, silent, this.id, returnByValue, generatePreview, userGesture,
-        false, evalCallback.bind(this));
+    callback(this.runtimeModel.createRemoteObject(response.result), response.exceptionDetails);
   }
 
   /**
    * @return {string}
    */
   label() {
     return this._label;
   }
 
   /**
@@ skipping 13 matching lines @@
       return;
     }
     if (this.name) {
       this._label = this.name;
       return;
     }
     var parsedUrl = this.origin.asParsedURL();
     this._label = parsedUrl ? parsedUrl.lastPathComponentWithFragment() : '';
   }
 };