HTML Imports: No more BlockingDocumentCreation.

Source/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 15 matching lines @@
  * 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/dom/Document.h"
 #include "core/dom/StyleEngine.h"
+#include "core/dom/custom/CustomElementMicrotaskQueue.h"
 #include "core/html/HTMLDocument.h"
 #include "core/html/imports/HTMLImportChild.h"
 #include "core/html/imports/HTMLImportsController.h"
 #include "core/loader/DocumentWriter.h"
 #include "platform/network/ContentSecurityPolicyResponseHeaders.h"
 
 
 namespace WebCore {
 
 HTMLImportLoader::HTMLImportLoader(HTMLImportsController* controller)
     : m_controller(controller)
     , m_state(StateLoading)
+    , m_microtaskQueue(CustomElementMicrotaskQueue::create())
 {
 }
 
 HTMLImportLoader::~HTMLImportLoader()
 {
     clear();
 }
 
 void HTMLImportLoader::importDestroyed()
 {
@@ skipping 115 matching lines @@
 void HTMLImportLoader::didFinishLoading()
 {
     for (size_t i = 0; i < m_imports.size(); ++i)
         m_imports[i]->didFinishLoading();
 
     clearResource();
 
     ASSERT(!m_importedDocument || !m_importedDocument->parsing());
 }
 
-void HTMLImportLoader::addImport(HTMLImportChild* client)
+void HTMLImportLoader::addImport(HTMLImportChild* import)
 {
-    ASSERT(kNotFound == m_imports.find(client));
-    m_imports.append(client);
+    ASSERT(kNotFound == m_imports.find(import));
+
+    // Ensuring firstImport() manages all children that is loaded by the document.
+    //
+    // FIXME:
+    //   This is a design flaw.
+    //   Import children should be managed by HTMLImportLoader, not by HTMLImport.
+    if (!m_imports.isEmpty() && import->precedes(firstImport())) {
+        import->takeChildrenFrom(firstImport());
+        m_imports.insert(0, import);
+    } else {
+        m_imports.append(import);
+    }
+
     if (isDone())
-        client->didFinishLoading();
+        import->didFinishLoading();
 }
 
 void HTMLImportLoader::removeImport(HTMLImportChild* client)
 {
     ASSERT(kNotFound != m_imports.find(client));
     m_imports.remove(m_imports.find(client));
 }
 
+bool HTMLImportLoader::shouldBlockScriptExecution() const
+{
+    for (size_t i = 0; i < m_imports.size(); ++i) {
+        if (!m_imports[i]->state().shouldBlockScriptExecution())
+            return false;
+    }
+
+    return true;
+}
+
+PassRefPtr<CustomElementMicrotaskQueue> HTMLImportLoader::microtaskQueue() const
+{
+    return m_microtaskQueue;
+}
+
 } // namespace WebCore