Move exports from Document to Module

sky/engine/core/html/imports/HTMLImportLoader.cpp

 /*
  * Copyright (C) 2013 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 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * 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 "core/html/imports/HTMLImportLoader.h"
 
+#include "core/app/Module.h"
 #include "core/dom/Document.h"
 #include "core/dom/DocumentParser.h"
 #include "core/dom/StyleEngine.h"
 #include "core/dom/custom/CustomElementSyncMicrotaskQueue.h"
 #include "core/html/HTMLDocument.h"
 #include "core/html/imports/HTMLImportChild.h"
 #include "core/html/imports/HTMLImportsController.h"
 
 namespace blink {
 
@@ skipping 13 matching lines @@
 
 #if !ENABLE(OILPAN)
 void HTMLImportLoader::importDestroyed()
 {
     clear();
 }
 
 void HTMLImportLoader::clear()
 {
     m_controller = nullptr;
+    m_module.clear();
     if (m_document) {
         m_document->setImportsController(0);
         m_document->cancelParsing();
         m_document.clear();
     }
     m_fetcher.clear();
 }
 #endif
 
 void HTMLImportLoader::startLoading(const KURL& url)
@@ skipping 10 matching lines @@
         m_controller->master()->addMessage(consoleMessage);
         setState(StateError);
         return;
     }
     setState(startWritingAndParsing(response.Pass()));
 }
 
 HTMLImportLoader::State HTMLImportLoader::startWritingAndParsing(mojo::URLResponsePtr response)
 {
     ASSERT(!m_imports.isEmpty());
+    WeakPtr<Document> contextDocument = m_controller->master()->contextDocument();
+    ASSERT(contextDocument.get());
     KURL url(ParsedURLString, String::fromUTF8(response->url));
-    DocumentInit init = DocumentInit(url, 0, m_controller->master()->contextDocument(), m_controller)
+    DocumentInit init = DocumentInit(url, 0, contextDocument, m_controller)
         .withRegistrationContext(m_controller->master()->registrationContext());
     m_document = HTMLDocument::create(init);
+    m_module = Module::create(contextDocument.get(), nullptr, m_document.get(), url.string());
     m_document->startParsing();
     m_document->parser()->parse(response->body.Pass());
     return StateLoading;
 }
 
 HTMLImportLoader::State HTMLImportLoader::finishWriting()
 {
     return StateWritten;
 }
 
@@ skipping 84 matching lines @@
 {
     visitor->trace(m_controller);
 #if ENABLE(OILPAN)
     visitor->trace(m_imports);
 #endif
     visitor->trace(m_document);
     visitor->trace(m_microtaskQueue);
 }
 
 } // namespace blink