Move exports from Document to Module

sky/engine/bindings/core/v8/ScriptController.cpp

 /*
  * Copyright (C) 2008, 2009 Google Inc. All rights reserved.
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2014 Opera Software ASA. 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
@@ skipping 27 matching lines @@
 #include "bindings/core/v8/ScriptSourceCode.h"
 #include "bindings/core/v8/ScriptValue.h"
 #include "bindings/core/v8/V8Binding.h"
 #include "bindings/core/v8/V8Event.h"
 #include "bindings/core/v8/V8GCController.h"
 #include "bindings/core/v8/V8HTMLElement.h"
 #include "bindings/core/v8/V8PerContextData.h"
 #include "bindings/core/v8/V8ScriptRunner.h"
 #include "bindings/core/v8/V8Window.h"
 #include "bindings/core/v8/WindowProxy.h"
+#include "core/app/Module.h"
 #include "core/dom/Document.h"
 #include "core/dom/Node.h"
 #include "core/events/Event.h"
 #include "core/events/EventListener.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "core/frame/UseCounter.h"
 #include "core/html/imports/HTMLImportChild.h"
 #include "core/html/imports/HTMLImportLoader.h"
@@ skipping 263 matching lines @@
             evaluationResult = v8::Local<v8::Value>::New(m_isolate, v8::Undefined(m_isolate));
         resultArray->Set(i, evaluationResult);
     }
 
     if (results) {
         for (size_t i = 0; i < resultArray->Length(); ++i)
             results->append(handleScope.Escape(resultArray->Get(i)));
     }
 }
 
-void ScriptController::executeModuleScript(Document& document, const String& source, const TextPosition& textPosition)
+void ScriptController::executeModuleScript(AbstractModule* module, const String& source, const TextPosition& textPosition)
 {
     v8::HandleScope handleScope(m_isolate);
     v8::Handle<v8::Context> context = toV8Context(m_frame, DOMWrapperWorld::mainWorld());
     if (context.IsEmpty())
         return;
 
     ScriptState* scriptState = ScriptState::from(context);
     ScriptState::Scope scope(scriptState);
 
     RefPtr<LocalFrame> protect(m_frame);
 
     v8::TryCatch tryCatch;
     tryCatch.SetVerbose(true);
 
-    V8ScriptModule module;
-    module.resourceName = document.url().string();
-    module.textPosition = textPosition;
-    // FIXME: This should be the actual module object instead of the document.
-    module.moduleObject = toV8(&document, context->Global(), m_isolate);
-    module.source = source;
+    V8ScriptModule scriptModule;
+    scriptModule.resourceName = module->url();
+    scriptModule.textPosition = textPosition;
+    scriptModule.moduleObject = toV8(module, context->Global(), m_isolate);
+    scriptModule.source = source;
 
-    if (HTMLImport* parent = document.import()) {
-        for (HTMLImport* child = parent->firstChild(); child; child = child->next()) {
-            if (Element* link = static_cast<HTMLImportChild*>(child)->link()) {
+    if (HTMLImport* parent = module->document()->import()) {
+        for (HTMLImportChild* child = static_cast<HTMLImportChild*>(parent->firstChild());
+             child; child = static_cast<HTMLImportChild*>(child->next())) {
+            if (Element* link = child->link()) {
                 String name = link->getAttribute(HTMLNames::asAttr);
                 if (!name.isEmpty()) {
-                    module.formalDependencies.append(name);
+                    scriptModule.formalDependencies.append(name);
                     v8::Handle<v8::Value> actual;
-                    if (child->document())
-                        actual = child->document()->exports().v8Value();
+                    if (Module* childModule = child->module())
+                        actual = childModule->exports().v8Value();
                     if (actual.IsEmpty())
                         actual = v8::Undefined(m_isolate);
-                    module.resolvedDependencies.append(actual);
+                    scriptModule.resolvedDependencies.append(actual);
                 }
             }
         }
     }
 
-    V8ScriptRunner::runModule(m_isolate, m_frame->document(), module);
+    V8ScriptRunner::runModule(m_isolate, m_frame->document(), scriptModule);
 }
 
 } // namespace blink