Index: Source/core/inspector/InjectedScript.cpp |
diff --git a/Source/core/inspector/InjectedScript.cpp b/Source/core/inspector/InjectedScript.cpp |
index 9d46e69bdf5a2a590d74c4adcf6201c7eaaf57db..0ee5e624cba0c0090d4fa9b46203462785395d0f 100644 |
--- a/Source/core/inspector/InjectedScript.cpp |
+++ b/Source/core/inspector/InjectedScript.cpp |
@@ -57,29 +57,31 @@ InjectedScript::InjectedScript(ScriptObject injectedScriptObject, InspectedState |
{ |
} |
-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 forceObjectId, bool generatePreview, RefPtr<TypeBuilder::Runtime::RemoteObject>* result, TypeBuilder::OptOutput<bool>* wasThrown) |
{ |
ScriptFunctionCall function(injectedScriptObject(), "evaluate"); |
function.appendArgument(expression); |
function.appendArgument(objectGroup); |
function.appendArgument(includeCommandLineAPI); |
function.appendArgument(returnByValue); |
+ function.appendArgument(forceObjectId); |
function.appendArgument(generatePreview); |
makeEvalCall(errorString, function, result, wasThrown); |
} |
-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) |
+void InjectedScript::callFunctionOn(ErrorString* errorString, const String& objectId, const String& expression, const String& arguments, bool returnByValue, bool forceObjectId, bool generatePreview, RefPtr<TypeBuilder::Runtime::RemoteObject>* result, TypeBuilder::OptOutput<bool>* wasThrown) |
{ |
ScriptFunctionCall function(injectedScriptObject(), "callFunctionOn"); |
function.appendArgument(objectId); |
function.appendArgument(expression); |
function.appendArgument(arguments); |
function.appendArgument(returnByValue); |
+ function.appendArgument(forceObjectId); |
function.appendArgument(generatePreview); |
makeEvalCall(errorString, function, result, wasThrown); |
} |
-void InjectedScript::evaluateOnCallFrame(ErrorString* errorString, const ScriptValue& callFrames, 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 String& callFrameId, const String& expression, const String& objectGroup, bool includeCommandLineAPI, bool returnByValue, bool forceObjectId, bool generatePreview, RefPtr<RemoteObject>* result, TypeBuilder::OptOutput<bool>* wasThrown) |
{ |
ScriptFunctionCall function(injectedScriptObject(), "evaluateOnCallFrame"); |
function.appendArgument(callFrames); |
@@ -88,6 +90,7 @@ void InjectedScript::evaluateOnCallFrame(ErrorString* errorString, const ScriptV |
function.appendArgument(objectGroup); |
function.appendArgument(includeCommandLineAPI); |
function.appendArgument(returnByValue); |
+ function.appendArgument(forceObjectId); |
function.appendArgument(generatePreview); |
makeEvalCall(errorString, function, result, wasThrown); |
} |