HTML Imports: Get rid of needsProcessOrStop() from dom/custom/

Source/core/dom/custom/CustomElementMicrotaskDispatcher.cpp

Index: Source/core/dom/custom/CustomElementMicrotaskDispatcher.cpp
diff --git a/Source/core/dom/custom/CustomElementMicrotaskDispatcher.cpp b/Source/core/dom/custom/CustomElementMicrotaskDispatcher.cpp
index fc622343b881b6c4f2adf9e79f5ce8f6e427afed..a908d4a20bd467568be7fb9d53add2b7ff358fe5 100644
--- a/Source/core/dom/custom/CustomElementMicrotaskDispatcher.cpp
+++ b/Source/core/dom/custom/CustomElementMicrotaskDispatcher.cpp
@@ -6,6 +6,7 @@
 #include "core/dom/custom/CustomElementMicrotaskDispatcher.h"
 
 #include "core/dom/Microtask.h"
+#include "core/dom/custom/CustomElementAsyncImportMicrotaskQueue.h"
 #include "core/dom/custom/CustomElementCallbackDispatcher.h"
 #include "core/dom/custom/CustomElementCallbackQueue.h"
 #include "core/dom/custom/CustomElementMicrotaskImportStep.h"
@@ -22,6 +23,7 @@ CustomElementMicrotaskDispatcher::CustomElementMicrotaskDispatcher()
     : m_hasScheduledMicrotask(false)
     , m_phase(Quiescent)
     , m_resolutionAndImports(CustomElementMicrotaskQueue::create())
+    , m_asyncImports(CustomElementAsyncImportMicrotaskQueue::create())
 {
 }
 
@@ -33,30 +35,48 @@ CustomElementMicrotaskDispatcher& CustomElementMicrotaskDispatcher::instance()
     return *instance;
 }
 
-void CustomElementMicrotaskDispatcher::enqueue(HTMLImportLoader* importLoader, PassOwnPtrWillBeRawPtr<CustomElementMicrotaskStep> step)
+void CustomElementMicrotaskDispatcher::enqueue(HTMLImportLoader* parentLoader, PassOwnPtrWillBeRawPtr<CustomElementMicrotaskStep> step)
 {
-    ASSERT(m_phase == Quiescent || m_phase == DispatchingCallbacks);
-    ensureMicrotaskScheduled();
-    if (importLoader)
-        importLoader->microtaskQueue()->enqueue(step);
+    ensureMicrotaskScheduledForMicrotaskSteps();
+    if (parentLoader)
+        parentLoader->microtaskQueue()->enqueue(step);
     else
         m_resolutionAndImports->enqueue(step);
 }
 
+void CustomElementMicrotaskDispatcher::enqueue(HTMLImportLoader* parentLoader, PassOwnPtr<CustomElementMicrotaskImportStep> step, bool importIsSync)
+{
+    ensureMicrotaskScheduledForMicrotaskSteps();
+    if (importIsSync)
+        enqueue(parentLoader, PassOwnPtr<CustomElementMicrotaskStep>(step));
+    else
+        m_asyncImports->enqueue(step);
+}
+
 void CustomElementMicrotaskDispatcher::enqueue(CustomElementCallbackQueue* queue)
 {
-    ASSERT(m_phase == Quiescent || m_phase == Resolving);
-    ensureMicrotaskScheduled();
+    ensureMicrotaskScheduledForElementQueue();
     queue->setOwner(kMicrotaskQueueId);
     m_elements.append(queue);
 }
 
 void CustomElementMicrotaskDispatcher::importDidFinish(CustomElementMicrotaskImportStep* step)
 {
+    ensureMicrotaskScheduledForMicrotaskSteps();
+}
+
+void CustomElementMicrotaskDispatcher::ensureMicrotaskScheduledForMicrotaskSteps()
+{
     ASSERT(m_phase == Quiescent || m_phase == DispatchingCallbacks);
     ensureMicrotaskScheduled();
 }
 
+void CustomElementMicrotaskDispatcher::ensureMicrotaskScheduledForElementQueue()
+{
+    ASSERT(m_phase == Quiescent || m_phase == Resolving);
+    ensureMicrotaskScheduled();
+}
+
 void CustomElementMicrotaskDispatcher::ensureMicrotaskScheduled()
 {
     if (!m_hasScheduledMicrotask) {
@@ -84,6 +104,8 @@ void CustomElementMicrotaskDispatcher::doDispatch()
 
     m_phase = Resolving;
     m_resolutionAndImports->dispatch();
+    if (m_resolutionAndImports->isEmpty())
+        m_asyncImports->dispatch();
 
     m_phase = DispatchingCallbacks;
     for (WillBeHeapVector<RawPtrWillBeMember<CustomElementCallbackQueue> >::iterator it = m_elements.begin(); it != m_elements.end(); ++it) {
@@ -109,7 +131,11 @@ void CustomElementMicrotaskDispatcher::trace(Visitor* visitor)
 void CustomElementMicrotaskDispatcher::show()
 {
     fprintf(stderr, "Dispatcher:\n");
-    m_resolutionAndImports->show(1);
+    fprintf(stderr, "  Sync:\n");
+    m_resolutionAndImports->show(3);
+    fprintf(stderr, "  Async:\n");
+    m_asyncImports->show(3);
+
 }
 #endif