| Index: Source/core/inspector/InjectedScriptModule.cpp
|
| diff --git a/Source/core/inspector/InjectedScriptModule.cpp b/Source/core/inspector/InjectedScriptModule.cpp
|
| index e888116222bf93eb1ac363a711e32269a7caa890..73562f4cd637d2dd9b743ee606800e5e98b269ef 100644
|
| --- a/Source/core/inspector/InjectedScriptModule.cpp
|
| +++ b/Source/core/inspector/InjectedScriptModule.cpp
|
| @@ -32,7 +32,7 @@
|
| #include "core/inspector/InjectedScriptModule.h"
|
|
|
| #include "bindings/v8/ScriptFunctionCall.h"
|
| -#include "bindings/v8/ScriptObject.h"
|
| +#include "bindings/v8/ScriptValue.h"
|
| #include "core/inspector/InjectedScript.h"
|
| #include "core/inspector/InjectedScriptManager.h"
|
|
|
| @@ -51,14 +51,14 @@ void InjectedScriptModule::ensureInjected(InjectedScriptManager* injectedScriptM
|
| return;
|
|
|
| // FIXME: Make the InjectedScript a module itself.
|
| - ScriptFunctionCall function(injectedScript.injectedScriptObject(), "module");
|
| + ScriptFunctionCall function(injectedScript.injectedScriptValue(), "module");
|
| function.appendArgument(name());
|
| bool hadException = false;
|
| ScriptValue resultValue = injectedScript.callFunctionWithEvalEnabled(function, hadException);
|
| ASSERT(!hadException);
|
| ScriptState::Scope scope(scriptState);
|
| if (hadException || resultValue.isEmpty() || !resultValue.isObject()) {
|
| - ScriptFunctionCall function(injectedScript.injectedScriptObject(), "injectModule");
|
| + ScriptFunctionCall function(injectedScript.injectedScriptValue(), "injectModule");
|
| function.appendArgument(name());
|
| function.appendArgument(source());
|
| resultValue = injectedScript.callFunctionWithEvalEnabled(function, hadException);
|
| @@ -68,8 +68,7 @@ void InjectedScriptModule::ensureInjected(InjectedScriptManager* injectedScriptM
|
| }
|
| }
|
|
|
| - ScriptObject moduleObject(scriptState, resultValue);
|
| - initialize(moduleObject, injectedScriptManager->inspectedStateAccessCheck());
|
| + initialize(resultValue, injectedScriptManager->inspectedStateAccessCheck());
|
| }
|
|
|
| } // namespace WebCore
|
|
|