Merge DevTools Refactor CL to Blink36

Source/core/inspector/InjectedScriptModule.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 21 matching lines @@
 #include "core/inspector/InjectedScriptModule.h"
 
 #include "bindings/v8/ScriptFunctionCall.h"
 #include "bindings/v8/ScriptObject.h"
 #include "core/inspector/InjectedScript.h"
 #include "core/inspector/InjectedScriptManager.h"
 
 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;
     ScriptValue resultValue = injectedScript.callFunctionWithEvalEnabled(function, hadException);
     ASSERT(!hadException);
     V8ScriptState::Scope scope(scriptState->v8ScriptState());
     if (hadException || resultValue.isEmpty() || !resultValue.isObject()) {
         ScriptFunctionCall function(injectedScript.injectedScriptObject(), "injectModule");
         function.appendArgument(name());
         function.appendArgument(source());
         resultValue = injectedScript.callFunctionWithEvalEnabled(function, hadException);
         if (hadException || resultValue.isEmpty() || !resultValue.isObject()) {
             ASSERT_NOT_REACHED();
             return;
         }
     }
 
     ScriptObject moduleObject(scriptState, resultValue);
     initialize(moduleObject, injectedScriptManager->inspectedStateAccessCheck());
 }
 
 } // namespace WebCore