HTML Imports: No more BlockingDocumentCreation.

Source/core/dom/custom/CustomElementMicrotaskDispatcher.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/dom/custom/CustomElementMicrotaskDispatcher.h"
 
 #include "core/dom/Microtask.h"
 #include "core/dom/custom/CustomElementCallbackDispatcher.h"
 #include "core/dom/custom/CustomElementCallbackQueue.h"
 #include "core/dom/custom/CustomElementMicrotaskImportStep.h"
+#include "core/dom/custom/CustomElementMicrotaskQueue.h"
 #include "core/dom/custom/CustomElementScheduler.h"
-#include "core/html/imports/HTMLImport.h"
+#include "core/html/imports/HTMLImportLoader.h"
 #include "wtf/MainThread.h"
 
 namespace WebCore {
 
 static const CustomElementCallbackQueue::ElementQueueId kMicrotaskQueueId = 0;
 
 CustomElementMicrotaskDispatcher::CustomElementMicrotaskDispatcher()
     : m_hasScheduledMicrotask(false)
     , m_phase(Quiescent)
+    , m_resolutionAndImports(CustomElementMicrotaskQueue::create())
 {
 }
 
 CustomElementMicrotaskDispatcher& CustomElementMicrotaskDispatcher::instance()
 {
     DEFINE_STATIC_LOCAL(CustomElementMicrotaskDispatcher, instance, ());
     return instance;
 }
 
-void CustomElementMicrotaskDispatcher::enqueue(HTMLImport* import, PassOwnPtr<CustomElementMicrotaskStep> step)
+void CustomElementMicrotaskDispatcher::enqueue(HTMLImportLoader* importLoader, PassOwnPtr<CustomElementMicrotaskStep> step)
 {
     ASSERT(m_phase == Quiescent || m_phase == DispatchingCallbacks);
     ensureMicrotaskScheduled();
-    if (import && import->customElementMicrotaskStep())
-        import->customElementMicrotaskStep()->enqueue(step);
+    if (importLoader)
+        importLoader->microtaskQueue()->enqueue(step);
     else
-        m_resolutionAndImports.enqueue(step);
+        m_resolutionAndImports->enqueue(step);
 }
 
 void CustomElementMicrotaskDispatcher::enqueue(CustomElementCallbackQueue* queue)
 {
     ASSERT(m_phase == Quiescent || m_phase == Resolving);
     ensureMicrotaskScheduled();
     queue->setOwner(kMicrotaskQueueId);
     m_elements.append(queue);
 }
 
@@ skipping 22 matching lines @@
 
     ASSERT(m_phase == Quiescent && m_hasScheduledMicrotask);
     m_hasScheduledMicrotask = false;
 
     // Finishing microtask work deletes all
     // CustomElementCallbackQueues. Being in a callback delivery scope
     // implies those queues could still be in use.
     ASSERT_WITH_SECURITY_IMPLICATION(!CustomElementCallbackDispatcher::inCallbackDeliveryScope());
 
     m_phase = Resolving;
-    m_resolutionAndImports.dispatch();
+    m_resolutionAndImports->dispatch();
 
     m_phase = DispatchingCallbacks;
     for (Vector<CustomElementCallbackQueue*>::iterator it = m_elements.begin();it != m_elements.end(); ++it) {
         // Created callback may enqueue an attached callback.
         CustomElementCallbackDispatcher::CallbackDeliveryScope scope;
         (*it)->processInElementQueue(kMicrotaskQueueId);
     }
 
     m_elements.clear();
     CustomElementScheduler::microtaskDispatcherDidFinish();
     m_phase = Quiescent;
 }
 
 } // namespace WebCore