Index: Source/core/inspector/InspectorRuntimeAgent.cpp |
diff --git a/Source/core/inspector/InspectorRuntimeAgent.cpp b/Source/core/inspector/InspectorRuntimeAgent.cpp |
index fcb3a274f568dd23015eec601b7083adca0f2e48..20220d9d35e45fede750a248e76c8b11d9e47726 100644 |
--- a/Source/core/inspector/InspectorRuntimeAgent.cpp |
+++ b/Source/core/inspector/InspectorRuntimeAgent.cpp |
@@ -66,7 +66,7 @@ static ScriptDebugServer::PauseOnExceptionsState setPauseOnExceptionsState(Scrip |
return presentState; |
} |
-void InspectorRuntimeAgent::evaluate(ErrorString* errorString, const String& expression, const String* const objectGroup, const bool* const includeCommandLineAPI, const bool* const doNotPauseOnExceptionsAndMuteConsole, const int* executionContextId, const bool* const returnByValue, const bool* generatePreview, RefPtr<TypeBuilder::Runtime::RemoteObject>& result, TypeBuilder::OptOutput<bool>* wasThrown) |
+void InspectorRuntimeAgent::evaluate(ErrorString* errorString, const String& expression, const String* const objectGroup, const bool* const includeCommandLineAPI, const bool* const doNotPauseOnExceptionsAndMuteConsole, const int* executionContextId, const bool* const returnByValue, const bool* const forceObjectId, const bool* generatePreview, RefPtr<TypeBuilder::Runtime::RemoteObject>& result, TypeBuilder::OptOutput<bool>* wasThrown) |
{ |
InjectedScript injectedScript = injectedScriptForEval(errorString, executionContextId); |
if (injectedScript.hasNoValue()) |
@@ -77,7 +77,7 @@ void InspectorRuntimeAgent::evaluate(ErrorString* errorString, const String& exp |
if (asBool(doNotPauseOnExceptionsAndMuteConsole)) |
muteConsole(); |
- injectedScript.evaluate(errorString, expression, objectGroup ? *objectGroup : "", asBool(includeCommandLineAPI), asBool(returnByValue), asBool(generatePreview), &result, wasThrown); |
+ injectedScript.evaluate(errorString, expression, objectGroup ? *objectGroup : "", asBool(includeCommandLineAPI), asBool(returnByValue), asBool(forceObjectId), asBool(generatePreview), &result, wasThrown); |
if (asBool(doNotPauseOnExceptionsAndMuteConsole)) { |
unmuteConsole(); |
@@ -85,7 +85,7 @@ void InspectorRuntimeAgent::evaluate(ErrorString* errorString, const String& exp |
} |
} |
-void InspectorRuntimeAgent::callFunctionOn(ErrorString* errorString, const String& objectId, const String& expression, const RefPtr<JSONArray>* const optionalArguments, const bool* const doNotPauseOnExceptionsAndMuteConsole, const bool* const returnByValue, const bool* generatePreview, RefPtr<TypeBuilder::Runtime::RemoteObject>& result, TypeBuilder::OptOutput<bool>* wasThrown) |
+void InspectorRuntimeAgent::callFunctionOn(ErrorString* errorString, const String& objectId, const String& expression, const RefPtr<JSONArray>* const optionalArguments, const bool* const doNotPauseOnExceptionsAndMuteConsole, const bool* const returnByValue, const bool* const forceObjectId, const bool* generatePreview, RefPtr<TypeBuilder::Runtime::RemoteObject>& result, TypeBuilder::OptOutput<bool>* wasThrown) |
{ |
InjectedScript injectedScript = m_injectedScriptManager->injectedScriptForObjectId(objectId); |
if (injectedScript.hasNoValue()) { |
@@ -102,7 +102,7 @@ void InspectorRuntimeAgent::callFunctionOn(ErrorString* errorString, const Strin |
if (asBool(doNotPauseOnExceptionsAndMuteConsole)) |
muteConsole(); |
- injectedScript.callFunctionOn(errorString, objectId, expression, arguments, asBool(returnByValue), asBool(generatePreview), &result, wasThrown); |
+ injectedScript.callFunctionOn(errorString, objectId, expression, arguments, asBool(returnByValue), asBool(forceObjectId), asBool(generatePreview), &result, wasThrown); |
if (asBool(doNotPauseOnExceptionsAndMuteConsole)) { |
unmuteConsole(); |