[DevTools] Simplify evaluation callbacks on frontend

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 533 matching lines @@
 
 WebInspector.ExecutionContext.prototype = {
     /**
      * @param {string} expression
      * @param {string} objectGroup
      * @param {boolean} includeCommandLineAPI
      * @param {boolean} doNotPauseOnExceptionsAndMuteConsole
      * @param {boolean} returnByValue
      * @param {boolean} generatePreview
      * @param {boolean} userGesture
-     * @param {function(?WebInspector.RemoteObject, boolean, ?RuntimeAgent.RemoteObject=, ?RuntimeAgent.ExceptionDetails=)} callback
+     * @param {function(?WebInspector.RemoteObject, !RuntimeAgent.ExceptionDetails=)} callback
      */
     evaluate: function(expression, objectGroup, includeCommandLineAPI, doNotPauseOnExceptionsAndMuteConsole, returnByValue, generatePreview, userGesture, callback)
     {
         // FIXME: It will be moved to separate ExecutionContext.
         if (this.debuggerModel.selectedCallFrame()) {
             this.debuggerModel.evaluateOnSelectedCallFrame(expression, objectGroup, includeCommandLineAPI, doNotPauseOnExceptionsAndMuteConsole, returnByValue, generatePreview, callback);
             return;
         }
         this._evaluateGlobal.apply(this, arguments);
     },
 
     /**
      * @param {string} objectGroup
-     * @param {boolean} returnByValue
      * @param {boolean} generatePreview
-     * @param {function(?WebInspector.RemoteObject, boolean, ?RuntimeAgent.RemoteObject=, ?RuntimeAgent.ExceptionDetails=)} callback
+     * @param {function(?WebInspector.RemoteObject, !RuntimeAgent.ExceptionDetails=)} callback
      */
-    globalObject: function(objectGroup, returnByValue, generatePreview, callback)
+    globalObject: function(objectGroup, generatePreview, callback)
     {
-        this._evaluateGlobal("this", objectGroup, false, true, returnByValue, generatePreview, false, callback);
+        this._evaluateGlobal("this", objectGroup, false, true, false, generatePreview, false, callback);
     },
 
     /**
      * @param {string} expression
      * @param {string} objectGroup
      * @param {boolean} includeCommandLineAPI
      * @param {boolean} doNotPauseOnExceptionsAndMuteConsole
      * @param {boolean} returnByValue
      * @param {boolean} generatePreview
      * @param {boolean} userGesture
-     * @param {function(?WebInspector.RemoteObject, boolean, ?RuntimeAgent.RemoteObject=, ?RuntimeAgent.ExceptionDetails=)} callback
+     * @param {function(?WebInspector.RemoteObject, !RuntimeAgent.ExceptionDetails=)} callback
      */
     _evaluateGlobal: function(expression, objectGroup, includeCommandLineAPI, doNotPauseOnExceptionsAndMuteConsole, returnByValue, generatePreview, userGesture, callback)
     {
         if (!expression) {
             // There is no expression, so the completion should happen against global properties.
             expression = "this";
         }
 
         /**
          * @this {WebInspector.ExecutionContext}
          * @param {?Protocol.Error} error
          * @param {!RuntimeAgent.RemoteObject} result
          * @param {!RuntimeAgent.ExceptionDetails=} exceptionDetails
          */
         function evalCallback(error, result, exceptionDetails)
         {
             if (error) {
                 console.error(error);
-                callback(null, false);
+                callback(null);
                 return;
             }
-
-            var wasThrown = !!exceptionDetails;
-            if (returnByValue)
-                callback(null, !!wasThrown, wasThrown ? null : result, exceptionDetails);
-            else
-                callback(this.runtimeModel.createRemoteObject(result), !!wasThrown, undefined, exceptionDetails);
+            callback(this.runtimeModel.createRemoteObject(result), exceptionDetails);
         }
         this.target().runtimeAgent().evaluate(expression, objectGroup, includeCommandLineAPI, doNotPauseOnExceptionsAndMuteConsole, this.id, returnByValue, generatePreview, userGesture, false, evalCallback.bind(this));
     },
 
     /**
      * @param {string} expressionString
      * @param {string} prefix
      * @param {boolean} force
      * @param {function(!Array.<string>, number=)} completionsReadyCallback
      */
@@ skipping 17 matching lines @@
             completionsReadyCallback([]);
             return;
         }
 
         if (!expressionString && this.debuggerModel.selectedCallFrame())
             this.debuggerModel.selectedCallFrame().variableNames(receivedPropertyNames.bind(this));
         else
             this.evaluate(expressionString, "completion", true, true, false, false, false, evaluated.bind(this));
 
         /**
+         * @param {?WebInspector.RemoteObject} result
+         * @param {!RuntimeAgent.ExceptionDetails=} exceptionDetails
          * @this {WebInspector.ExecutionContext}
          */
-        function evaluated(result, wasThrown)
+        function evaluated(result, exceptionDetails)
         {
-            if (!result || wasThrown) {
+            if (!result || !!exceptionDetails) {
                 completionsReadyCallback([]);
                 return;
             }
 
             /**
              * @param {?WebInspector.RemoteObject} object
              * @return {!Promise<?WebInspector.RemoteObject>}
              */
             function extractTarget(object)
             {
@@ skipping 63 matching lines @@
                 else if (object.type === "object" || object.type === "function")
                     object.callFunctionJSON(getCompletions, [WebInspector.RemoteObject.toCallArgument(object.subtype)], receivedPropertyNames.bind(this));
                 else if (object.type === "string" || object.type === "number" || object.type === "boolean")
                     this.evaluate("(" + getCompletions + ")(\"" + result.type + "\")", "completion", false, true, true, false, false, receivedPropertyNamesFromEval.bind(this));
             }
 
             extractTarget(result).then(completionsForObject.bind(this));
         }
 
         /**
-         * @param {?WebInspector.RemoteObject} notRelevant
-         * @param {boolean} wasThrown
-         * @param {?RuntimeAgent.RemoteObject=} result
+         * @param {?WebInspector.RemoteObject} result
+         * @param {!RuntimeAgent.ExceptionDetails=} exceptionDetails
          * @this {WebInspector.ExecutionContext}
          */
-        function receivedPropertyNamesFromEval(notRelevant, wasThrown, result)
+        function receivedPropertyNamesFromEval(result, exceptionDetails)
         {
             this.target().runtimeAgent().releaseObjectGroup("completion");
-            if (result && !wasThrown)
+            if (result && !exceptionDetails)
                 receivedPropertyNames.call(this, /** @type {!Object} */(result.value));
             else
                 completionsReadyCallback([]);
         }
 
         /**
          * @param {?Object} propertyNames
          * @this {WebInspector.ExecutionContext}
          */
         function receivedPropertyNames(propertyNames)
@@ skipping 270 matching lines @@
     /**
      * @return {boolean}
      */
     isNormalListenerType: function()
     {
         return this._listenerType === "normal";
     },
 
     __proto__: WebInspector.SDKObject.prototype
 }