DevTools: Added error message when the command is invoked from the console with exception

Source/core/inspector/InjectedScriptSource.js

 /*
  * Copyright (C) 2007 Apple Inc.  All rights reserved.
  * Copyright (C) 2013 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 599 matching lines @@
         try {
             var objectGroup = this._idToObjectGroupName[parsedObjectId.id];
             var func = InjectedScriptHost.eval("(" + expression + ")");
             if (typeof func !== "function")
                 return "Given expression does not evaluate to a function";
 
             return { wasThrown: false,
                      result: this._wrapObject(func.apply(object, resolvedArgs), objectGroup, returnByValue),
                      __proto__: null };
         } catch (e) {
-            return this._createThrownValue(e, objectGroup);
+            return this._createThrownValue(e, objectGroup, returnByValue, false);
         }
     },
 
     /**
      * Resolves a value from CallArgument description.
      * @param {!RuntimeAgent.CallArgument} callArgumentJson
      * @return {*} resolved value
      * @throws {string} error message
      */
     _resolveCallArgument: function(callArgumentJson)
@@ skipping 32 matching lines @@
      * @return {!Object}
      */
     _evaluateAndWrap: function(evalFunction, object, expression, objectGroup, isEvalOnCallFrame, injectCommandLineAPI, returnByValue, generatePreview, scopeChain)
     {
         var wrappedResult = this._evaluateOn(evalFunction, object, objectGroup, expression, isEvalOnCallFrame, injectCommandLineAPI, scopeChain);
         if (!wrappedResult.exceptionDetails) {
             return { wasThrown: false,
                      result: this._wrapObject(wrappedResult.result, objectGroup, returnByValue, generatePreview),
                      __proto__: null };
         }
-        return this._createThrownValue(wrappedResult.result, objectGroup, wrappedResult.exceptionDetails);
+        return this._createThrownValue(wrappedResult.result, objectGroup, returnByValue, generatePreview, wrappedResult.exceptionDetails);
     },
 
     /**
      * @param {*} value
      * @param {string} objectGroup
+     * @param {boolean} returnByValue
+     * @param {boolean} generatePreview
      * @param {!DebuggerAgent.ExceptionDetails=} exceptionDetails
      * @return {!Object}
      */
-    _createThrownValue: function(value, objectGroup, exceptionDetails)
+    _createThrownValue: function(value, objectGroup, returnByValue, generatePreview, exceptionDetails)

[vsevik, 2014/07/17 13:13:22]

I am not sure whether the changes we do here are safe for protocol.
Pavel, could you please have a look?

     {
-        var remoteObject = this._wrapObject(value, objectGroup);
-        try {
-            remoteObject.description = toStringDescription(value);
-        } catch (e) {}
+        var remoteObject = this._wrapObject(value, objectGroup, returnByValue, generatePreview && !(value instanceof Error));
+        if (!remoteObject.description || value instanceof Error) {
+            try {
+                remoteObject.description = toStringDescription(value);
+            } catch (e) {}
+        }
         return { wasThrown: true, result: remoteObject, exceptionDetails: exceptionDetails, __proto__: null };
     },
 
     /**
      * @param {!Function} evalFunction
      * @param {!Object} object
      * @param {string} objectGroup
      * @param {string} expression
      * @param {boolean} isEvalOnCallFrame
      * @param {boolean} injectCommandLineAPI
@@ skipping 995 matching lines @@
      */
     _logEvent: function(event)
     {
         inspectedWindow.console.log(event.type, event);
     }
 }
 
 injectedScript._commandLineAPIImpl = new CommandLineAPIImpl();
 return injectedScript;
 })