| Index: Source/core/inspector/InjectedScript.cpp
|
| diff --git a/Source/core/inspector/InjectedScript.cpp b/Source/core/inspector/InjectedScript.cpp
|
| index 1a5db2c9f3d2dcc0c526fcc9448ab565d26ef197..4d06f354c57f00bc55e9e4314fa07c4dfc6e8554 100644
|
| --- a/Source/core/inspector/InjectedScript.cpp
|
| +++ b/Source/core/inspector/InjectedScript.cpp
|
| @@ -57,7 +57,7 @@ InjectedScript::InjectedScript(ScriptValue injectedScriptObject, InspectedStateA
|
| {
|
| }
|
|
|
| -void InjectedScript::evaluate(ErrorString* errorString, const String& expression, const String& objectGroup, bool includeCommandLineAPI, bool returnByValue, bool generatePreview, RefPtr<TypeBuilder::Runtime::RemoteObject>* result, TypeBuilder::OptOutput<bool>* wasThrown)
|
| +void InjectedScript::evaluate(ErrorString* errorString, const String& expression, const String& objectGroup, bool includeCommandLineAPI, bool returnByValue, bool generatePreview, RefPtr<TypeBuilder::Runtime::RemoteObject>* result, TypeBuilder::OptOutput<bool>* wasThrown, RefPtr<TypeBuilder::Debugger::ExceptionDetails>* exceptionDetails)
|
| {
|
| ScriptFunctionCall function(injectedScriptObject(), "evaluate");
|
| function.appendArgument(expression);
|
| @@ -65,7 +65,7 @@ void InjectedScript::evaluate(ErrorString* errorString, const String& expression
|
| function.appendArgument(includeCommandLineAPI);
|
| function.appendArgument(returnByValue);
|
| function.appendArgument(generatePreview);
|
| - makeEvalCall(errorString, function, result, wasThrown);
|
| + makeEvalCall(errorString, function, result, wasThrown, exceptionDetails);
|
| }
|
|
|
| void InjectedScript::callFunctionOn(ErrorString* errorString, const String& objectId, const String& expression, const String& arguments, bool returnByValue, bool generatePreview, RefPtr<TypeBuilder::Runtime::RemoteObject>* result, TypeBuilder::OptOutput<bool>* wasThrown)
|
| @@ -79,7 +79,7 @@ void InjectedScript::callFunctionOn(ErrorString* errorString, const String& obje
|
| makeEvalCall(errorString, function, result, wasThrown);
|
| }
|
|
|
| -void InjectedScript::evaluateOnCallFrame(ErrorString* errorString, const ScriptValue& callFrames, const Vector<ScriptValue>& asyncCallStacks, const String& callFrameId, const String& expression, const String& objectGroup, bool includeCommandLineAPI, bool returnByValue, bool generatePreview, RefPtr<RemoteObject>* result, TypeBuilder::OptOutput<bool>* wasThrown)
|
| +void InjectedScript::evaluateOnCallFrame(ErrorString* errorString, const ScriptValue& callFrames, const Vector<ScriptValue>& asyncCallStacks, const String& callFrameId, const String& expression, const String& objectGroup, bool includeCommandLineAPI, bool returnByValue, bool generatePreview, RefPtr<RemoteObject>* result, TypeBuilder::OptOutput<bool>* wasThrown, RefPtr<TypeBuilder::Debugger::ExceptionDetails>* exceptionDetails)
|
| {
|
| ScriptFunctionCall function(injectedScriptObject(), "evaluateOnCallFrame");
|
| function.appendArgument(callFrames);
|
| @@ -90,7 +90,7 @@ void InjectedScript::evaluateOnCallFrame(ErrorString* errorString, const ScriptV
|
| function.appendArgument(includeCommandLineAPI);
|
| function.appendArgument(returnByValue);
|
| function.appendArgument(generatePreview);
|
| - makeEvalCall(errorString, function, result, wasThrown);
|
| + makeEvalCall(errorString, function, result, wasThrown, exceptionDetails);
|
| }
|
|
|
| void InjectedScript::restartFrame(ErrorString* errorString, const ScriptValue& callFrames, const String& callFrameId, RefPtr<JSONObject>* result)
|
|
|