Custom Elements: Encapsulates Async and Sync Queues into one class.

Source/core/dom/custom/CustomElementMicrotaskQueue.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:
  *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ 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/dom/custom/CustomElementMicrotaskQueue.h"
 
-#include "core/dom/custom/CustomElementCallbackDispatcher.h"
+#include "core/dom/custom/CustomElementMicrotaskImportStep.h"
+#include "core/html/imports/HTMLImportLoader.h"
 
 namespace WebCore {
 
-class MicrotaskQueueInvocationScope {
-public:
-#if defined(NDEBUG)
-    explicit MicrotaskQueueInvocationScope(CustomElementMicrotaskQueueBase*) { }
-#else
-    explicit MicrotaskQueueInvocationScope(CustomElementMicrotaskQueueBase* queue)
-        : m_parent(s_top)
-        , m_queue(queue)
-    {
-        s_top = this;
-        ASSERT(m_queue->isEmpty() || !hasReenter());
-    }
-
-    ~MicrotaskQueueInvocationScope()
-    {
-        s_top = m_parent;
-    }
-
-private:
-    bool hasReenter() const
-    {
-        for (MicrotaskQueueInvocationScope* scope = this->m_parent; scope; scope = scope->m_parent) {
-            if (scope->m_queue == m_queue)
-                return true;
-        }
-
-        return false;
-    }
-
-    MicrotaskQueueInvocationScope* m_parent;
-    CustomElementMicrotaskQueueBase* m_queue;
-
-    static MicrotaskQueueInvocationScope* s_top;
-#endif
-};
-
-#if !defined(NDEBUG)
-MicrotaskQueueInvocationScope* MicrotaskQueueInvocationScope::s_top = 0;
-#endif
-
-void CustomElementMicrotaskQueueBase::dispatch()
+CustomElementMicrotaskQueue::CustomElementMicrotaskQueue()
+    : m_syncQueue(CustomElementSyncMicrotaskQueue::create())
+    , m_asyncQueue(CustomElementAsyncImportMicrotaskQueue::create())
 {
-    MicrotaskQueueInvocationScope scope(this);
-    doDispatch();
 }
 
-void CustomElementMicrotaskQueueBase::trace(Visitor* visitor)
+void CustomElementMicrotaskQueue::enqueue(HTMLImportLoader* parentLoader, PassOwnPtrWillBeRawPtr<CustomElementMicrotaskStep> step)
 {
-    visitor->trace(m_queue);
+    if (parentLoader)
+        parentLoader->microtaskQueue()->enqueue(step);
+    else
+        m_syncQueue->enqueue(step);
+}
+
+void CustomElementMicrotaskQueue::enqueue(HTMLImportLoader* parentLoader, PassOwnPtrWillBeRawPtr<CustomElementMicrotaskImportStep> step, bool importIsSync)
+{
+    if (importIsSync)
+        enqueue(parentLoader, PassOwnPtrWillBeRawPtr<CustomElementMicrotaskStep>(step));
+    else
+        m_asyncQueue->enqueue(step);
+}
+
+void CustomElementMicrotaskQueue::dispatch()
+{
+    m_syncQueue->dispatch();
+    if (m_syncQueue->isEmpty())
+        m_asyncQueue->dispatch();
+}
+
+void CustomElementMicrotaskQueue::trace(Visitor* visitor)
+{
+    visitor->trace(m_syncQueue);
+    visitor->trace(m_asyncQueue);
 }
 
 #if !defined(NDEBUG)
-void CustomElementMicrotaskQueueBase::show(unsigned indent)
+void CustomElementMicrotaskQueue::show(unsigned indent)
 {
-    for (unsigned q = 0; q < m_queue.size(); ++q) {
-        if (m_queue[q])
-            m_queue[q]->show(indent);
-        else
-            fprintf(stderr, "%*snull\n", indent, "");
-    }
+    fprintf(stderr, "%*sSync:\n", indent, "");
+    m_syncQueue->show(indent + 1);
+    fprintf(stderr, "%*sAsync:\n", indent, "");
+    m_asyncQueue->show(indent + 1);
 }
 #endif
 
-void CustomElementMicrotaskQueue::enqueue(PassOwnPtrWillBeRawPtr<CustomElementMicrotaskStep> step)
-{
-    m_queue.append(step);
-}
-
-void CustomElementMicrotaskQueue::doDispatch()
-{
-    unsigned i;
-
-    for (i = 0; i < m_queue.size(); ++i) {
-        if (CustomElementMicrotaskStep::Processing == m_queue[i]->process())
-            break;
-    }
-
-    m_queue.remove(0, i);
-}
-
 } // namespace WebCore