[DevTools] Simplify evaluation callbacks on frontend

third_party/WebKit/Source/devtools/front_end/sdk/RemoteObject.js

 /*
  * Copyright (C) 2009 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 77 matching lines @@
     getOwnProperties: function(callback)
     {
         throw "Not implemented";
     },
 
     /**
      * @return {!Promise<!{properties: ?Array.<!WebInspector.RemoteObjectProperty>, internalProperties: ?Array.<!WebInspector.RemoteObjectProperty>}>}
      */
     getOwnPropertiesPromise: function()
     {
-        return new Promise(promiseConstructor.bind(this));
-
-        /**
-         * @param {function(!{properties: ?Array.<!WebInspector.RemoteObjectProperty>, internalProperties: ?Array.<!WebInspector.RemoteObjectProperty>})} success
-         * @this {WebInspector.RemoteObject}
-         */
-        function promiseConstructor(success)
-        {
-            this.getOwnProperties(getOwnPropertiesCallback.bind(null, success));
-        }
-
-        /**
-         * @param {function(!{properties: ?Array.<!WebInspector.RemoteObjectProperty>, internalProperties: ?Array.<!WebInspector.RemoteObjectProperty>})} callback
-         * @param {?Array.<!WebInspector.RemoteObjectProperty>} properties
-         * @param {?Array.<!WebInspector.RemoteObjectProperty>} internalProperties
-         */
-        function getOwnPropertiesCallback(callback, properties, internalProperties)
-        {
-            callback({
-                properties: properties,
-                internalProperties: internalProperties
-            });
-        }
+        return new Promise((fulfill) => this.getOwnProperties((properties, internalProperties) => fulfill({ properties: properties, internalProperties: internalProperties })));

[lushnikov, 2016/08/11 00:55:44]

drop ()

lets' not nest arrow functions - looks funny!

[kozy, 2016/08/13 00:11:36]

Done.

     },
 
     /**
      * @param {boolean} accessorPropertiesOnly
      * @param {function(?Array<!WebInspector.RemoteObjectProperty>, ?Array<!WebInspector.RemoteObjectProperty>)} callback
      */
     getAllProperties: function(accessorPropertiesOnly, callback)
     {
         throw "Not implemented";
     },
 
     /**
      * @param {boolean} accessorPropertiesOnly
      * @return {!Promise<!{properties: ?Array<!WebInspector.RemoteObjectProperty>, internalProperties: ?Array<!WebInspector.RemoteObjectProperty>}>}
      */
     getAllPropertiesPromise: function(accessorPropertiesOnly)
     {
-        return new Promise(promiseConstructor.bind(this));
-
-        /**
-         * @param {function(!{properties: ?Array<!WebInspector.RemoteObjectProperty>, internalProperties: ?Array.<!WebInspector.RemoteObjectProperty>})} success
-         * @this {WebInspector.RemoteObject}
-         */
-        function promiseConstructor(success)
-        {
-            this.getAllProperties(accessorPropertiesOnly, getAllPropertiesCallback.bind(null, success));
-        }
-
-        /**
-         * @param {function(!{properties: ?Array<!WebInspector.RemoteObjectProperty>, internalProperties: ?Array<!WebInspector.RemoteObjectProperty>})} callback
-         * @param {?Array<!WebInspector.RemoteObjectProperty>} properties
-         * @param {?Array<!WebInspector.RemoteObjectProperty>} internalProperties
-         */
-        function getAllPropertiesCallback(callback, properties, internalProperties)
-        {
-            callback({
-                properties: properties,
-                internalProperties: internalProperties
-            });
-        }
+        return new Promise((fulfill) => this.getAllProperties(accessorPropertiesOnly, (properties, internalProperties) => fulfill({ properties: properties, internalProperties: internalProperties })));
     },
 
     /**
      * @return {!Promise<?Array<!WebInspector.EventListener>>}
      */
     eventListeners: function()
     {
         throw "Not implemented";
     },
 
@@ skipping 26 matching lines @@
         throw "Not implemented";
     },
 
     /**
      * @param {function(this:Object, ...)} functionDeclaration
      * @param {!Array<!RuntimeAgent.CallArgument>=} args
      * @return {!Promise<!WebInspector.CallFunctionResult>}
      */
     callFunctionPromise: function(functionDeclaration, args)
     {
-        return new Promise(promiseConstructor.bind(this));
-
-        /**
-         * @param {function(!WebInspector.CallFunctionResult)} success
-         * @this {WebInspector.RemoteObject}
-         */
-        function promiseConstructor(success)
-        {
-            this.callFunction(functionDeclaration, args, callFunctionCallback.bind(null, success));
-        }
-
-        /**
-         * @param {function(!WebInspector.CallFunctionResult)} callback
-         * @param {?WebInspector.RemoteObject} object
-         * @param {boolean=} wasThrown
-         */
-        function callFunctionCallback(callback, object, wasThrown)
-        {
-            callback({
-                object: object,
-                wasThrown: wasThrown
-            });
-        }
+        return new Promise((fulfill) => this.callFunction(functionDeclaration, args, (object, wasThrown) => fulfill({ object: object, wasThrown: wasThrown })));

[lushnikov, 2016/08/11 00:55:44]

ditto

[kozy, 2016/08/13 00:11:36]

Done.

     },
 
     /**
      * @template T
      * @param {function(this:Object, ...):T} functionDeclaration
      * @param {!Array<!RuntimeAgent.CallArgument>|undefined} args
      * @param {function(T)} callback
      */
     callFunctionJSON: function(functionDeclaration, args, callback)
     {
         throw "Not implemented";
     },
 
     /**
      * @param {function(this:Object, ...):T} functionDeclaration
      * @param {!Array<!RuntimeAgent.CallArgument>|undefined} args
      * @return {!Promise<T>}
      * @template T
      */
     callFunctionJSONPromise: function(functionDeclaration, args)
     {
-        return new Promise(promiseConstructor.bind(this));
-
-        /**
-         * @this {WebInspector.RemoteObject}
-         */
-        function promiseConstructor(success)
-        {
-            this.callFunctionJSON(functionDeclaration, args, success);
-        }
+        return new Promise((fulfill) => this.callFunctionJSON(functionDeclaration, args, fulfill));
     },
 
     /**
      * @return {!WebInspector.Target}
      */
     target: function()
     {
         throw new Error("Target-less object");
     },
 
@@ skipping 117 matching lines @@
     this._type = type;
     this._subtype = subtype;
     if (objectId) {
         // handle
         this._objectId = objectId;
         this._description = description;
         this._hasChildren = (type !== "symbol");
         this._preview = preview;
     } else {
         // Primitive or null object.
-        this._description = description || (value + "");
+        this._description = description;
+        if (!this._description && (typeof value !== "object" || value === null))
+            this._description = value + "";
         this._hasChildren = false;
         if (typeof unserializableValue !== "undefined") {
             this._unserializableValue = unserializableValue;
             if (unserializableValue === RuntimeAgent.UnserializableValue.Infinity ||
                 unserializableValue === RuntimeAgent.UnserializableValue.NegativeInfinity ||
                 unserializableValue === RuntimeAgent.UnserializableValue.Negative0 ||
                 unserializableValue === RuntimeAgent.UnserializableValue.NaN) {
                 this.value = Number(unserializableValue);
             } else {
                 this.value = unserializableValue;
@@ skipping 1102 matching lines @@
     },
 
     /**
      * @return {!WebInspector.RemoteObject}
      */
     object: function()
     {
         return this._object;
     }
 }