Changes to support a second VM.

Source/WebCore/bindings/v8/ScriptController.cpp

 /*
  * Copyright (C) 2008, 2009 Google Inc. All rights reserved.
  * Copyright (C) 2009 Apple 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.
@@ skipping 15 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "ScriptController.h"
 
 #include "PlatformSupport.h"
+#include "DartController.h"

[vsm, 2011/12/05 17:20:28]

We should refactor ScriptController to bindings/public and rename this to
JavaScriptController.  There should be no references to Dart here after that.

 #include "Document.h"
 #include "ScriptCallStack.h"
 #include "ScriptCallStackFactory.h"
 #include "ScriptableDocumentParser.h"
 #include "DOMWindow.h"
 #include "Event.h"
 #include "EventListener.h"
 #include "EventNames.h"
 #include "Frame.h"
 #include "FrameLoaderClient.h"
@@ skipping 64 matching lines @@
 ScriptController::ScriptController(Frame* frame)
     : m_frame(frame)
     , m_sourceURL(0)
     , m_inExecuteScript(false)
     , m_paused(false)
     , m_proxy(adoptPtr(new V8Proxy(frame)))
 #if ENABLE(NETSCAPE_PLUGIN_API)
     , m_wrappedWindowScriptNPObject(0)
 #endif
 {
+    // FIXME: should be set from outside.
+    m_controllers.set("dart", DartController::create(frame));
 }
 
 ScriptController::~ScriptController()
 {
 }
 
 void ScriptController::clearScriptObjects()
 {
     PluginObjectMap::iterator it = m_pluginObjects.begin();
     for (; it != m_pluginObjects.end(); ++it) {
@@ skipping 48 matching lines @@
 }
 
 void ScriptController::setIsolatedWorldSecurityOrigin(int worldID, PassRefPtr<SecurityOrigin> securityOrigin)
 {
     m_proxy->setIsolatedWorldSecurityOrigin(worldID, securityOrigin);
 }
 
 // Evaluate a script file in the environment of this proxy.
 ScriptValue ScriptController::evaluate(const ScriptSourceCode& sourceCode)
 {
+    if (!sourceCode.mimeType().isEmpty()) {
+        for (ControllerMap::iterator it = m_controllers.begin(); it != m_controllers.end(); ++it) {
+            if (it->second->isScriptTypeSupported(sourceCode.mimeType())) {
+                it->second->evaluate(sourceCode);
+                return ScriptValue();
+            }
+        }
+    }
+
     String sourceURL = sourceCode.url();
     const String* savedSourceURL = m_sourceURL;
     m_sourceURL = &sourceURL;
 
     v8::HandleScope handleScope;
     v8::Handle<v8::Context> v8Context = V8Proxy::mainWorldContext(m_proxy->frame());
     if (v8Context.IsEmpty())
         return ScriptValue();
 
     v8::Context::Scope scope(v8Context);
@@ skipping 19 matching lines @@
 }
 
 void ScriptController::finishedWithEvent(Event* event)
 {
     m_proxy->finishedWithEvent(event);
 }
 
 // Create a V8 object with an interceptor of NPObjectPropertyGetter.
 void ScriptController::bindToWindowObject(Frame* frame, const String& key, NPObject* object)
 {
+    for (ControllerMap::iterator it = m_controllers.begin(); it != m_controllers.end(); ++it)
+        it->second->bindToWindowObject(frame, key, object);
+
     v8::HandleScope handleScope;
 
     v8::Handle<v8::Context> v8Context = V8Proxy::mainWorldContext(frame);
     if (v8Context.IsEmpty())
         return;
 
     v8::Context::Scope scope(v8Context);
 
     v8::Handle<v8::Object> value = createV8ObjectForNPObject(object, 0);
 
@@ skipping 202 matching lines @@
 void ScriptController::namedItemAdded(HTMLDocument* doc, const AtomicString& name)
 {
     m_proxy->windowShell()->namedItemAdded(doc, name);
 }
 
 void ScriptController::namedItemRemoved(HTMLDocument* doc, const AtomicString& name)
 {
     m_proxy->windowShell()->namedItemRemoved(doc, name);
 }
 
+bool ScriptController::isScriptTypeSupported(const String& mimeType)
+{
+    if (mimeType.isEmpty())
+        return false;
+    for (ControllerMap::iterator it = m_controllers.begin(); it != m_controllers.end(); ++it) {
+        if (it->second->isScriptTypeSupported(mimeType))
+            return true;
+    }
+    return false;
+}
+
+AbstractController* ScriptController::controller(const String& name)
+{
+    return m_controllers.get(name).get();
+}
+
 } // namespace WebCore