Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1058)

Unified Diff: Source/core/inspector/InjectedScriptModule.cpp

Issue 300393002: Merge DevTools Refactor CL to Blink36 (Closed) Base URL: svn://svn.chromium.org/blink/branches/dart/1985
Patch Set: PTAL Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/inspector/InjectedScriptModule.h ('k') | Source/core/inspector/InjectedScriptSource.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/inspector/InjectedScriptModule.cpp
diff --git a/Source/core/inspector/InjectedScriptModule.cpp b/Source/core/inspector/InjectedScriptModule.cpp
index ee2f16ce37a34e63ea63d35dd7a2bedf68d24297..4a123dacc0a9cf61a2cf067055005a3c78a45df3 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;
« no previous file with comments | « Source/core/inspector/InjectedScriptModule.h ('k') | Source/core/inspector/InjectedScriptSource.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698