Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1297)

Unified Diff: Source/core/inspector/InjectedScriptSource.js

Issue 369333002: DevTools: Added error message when the command is invoked from the console with exception (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@add-evaluate-exception-details
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/inspector/InjectedScriptBase.cpp ('k') | Source/core/inspector/InspectorDebuggerAgent.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/inspector/InjectedScriptSource.js
diff --git a/Source/core/inspector/InjectedScriptSource.js b/Source/core/inspector/InjectedScriptSource.js
index 0d03ec579e6dffe97cebc08ac3ee80efee84f3c8..77c1439c34247e6831b7ffc9fdd3cfe5214ae7b4 100644
--- a/Source/core/inspector/InjectedScriptSource.js
+++ b/Source/core/inspector/InjectedScriptSource.js
@@ -617,7 +617,7 @@ InjectedScript.prototype = {
result: this._wrapObject(func.apply(object, resolvedArgs), objectGroup, returnByValue),
__proto__: null };
} catch (e) {
- return this._createThrownValue(e, objectGroup);
+ return this._createThrownValue(e, objectGroup, false);
}
},
@@ -670,18 +670,19 @@ InjectedScript.prototype = {
result: this._wrapObject(wrappedResult.result, objectGroup, returnByValue, generatePreview),
__proto__: null };
}
- return this._createThrownValue(wrappedResult.result, objectGroup, wrappedResult.exceptionDetails);
+ return this._createThrownValue(wrappedResult.result, objectGroup, generatePreview, wrappedResult.exceptionDetails);
},
/**
* @param {*} value
* @param {string} objectGroup
+ * @param {boolean} generatePreview
* @param {!DebuggerAgent.ExceptionDetails=} exceptionDetails
* @return {!Object}
*/
- _createThrownValue: function(value, objectGroup, exceptionDetails)
+ _createThrownValue: function(value, objectGroup, generatePreview, exceptionDetails)
{
- var remoteObject = this._wrapObject(value, objectGroup);
+ var remoteObject = this._wrapObject(value, objectGroup, false, generatePreview && !(value instanceof Error));
if (!remoteObject.description){
try {
remoteObject.description = toStringDescription(value);
« no previous file with comments | « Source/core/inspector/InjectedScriptBase.cpp ('k') | Source/core/inspector/InspectorDebuggerAgent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698