| Index: Source/core/inspector/InjectedScriptModule.cpp
|
| diff --git a/Source/core/inspector/InjectedScriptModule.cpp b/Source/core/inspector/InjectedScriptModule.cpp
|
| index e888116222bf93eb1ac363a711e32269a7caa890..c4442c00c1d4747cc5b91a2803420c998a5f9831 100644
|
| --- a/Source/core/inspector/InjectedScriptModule.cpp
|
| +++ b/Source/core/inspector/InjectedScriptModule.cpp
|
| @@ -39,18 +39,23 @@
|
| namespace WebCore {
|
|
|
| InjectedScriptModule::InjectedScriptModule(const String& name)
|
| - : InjectedScriptBase(name)
|
| + : V8InjectedScriptBase(name)
|
| {
|
| }
|
|
|
| void InjectedScriptModule::ensureInjected(InjectedScriptManager* injectedScriptManager, ScriptState* scriptState)
|
| {
|
| - InjectedScript injectedScript = injectedScriptManager->injectedScriptFor(scriptState);
|
| - ASSERT(!injectedScript.isEmpty());
|
| - if (injectedScript.isEmpty())
|
| + InjectedScript& injectedScriptRaw = injectedScriptManager->injectedScriptFor(scriptState);
|
| + ASSERT(!injectedScriptRaw.isEmpty());
|
| + if (injectedScriptRaw.isEmpty())
|
| return;
|
|
|
| - // FIXME: Make the InjectedScript a module itself.
|
| + ASSERT(injectedScriptRaw.isJavaScript());
|
| + if (!injectedScriptRaw.isJavaScript())
|
| + return;
|
| + V8InjectedScript& injectedScript = static_cast<V8InjectedScript&>(injectedScriptRaw);
|
| +
|
| + // FIXME: Make the V8InjectedScript a module itself.
|
| ScriptFunctionCall function(injectedScript.injectedScriptObject(), "module");
|
| function.appendArgument(name());
|
| bool hadException = false;
|
|
|