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

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 20 matching lines @@
 #include "config.h"
 #include "core/dom/custom/CustomElementMicrotaskQueue.h"
 
 #include "core/dom/custom/CustomElementCallbackDispatcher.h"
 
 namespace WebCore {
 
 class MicrotaskQueueInvocationScope {
 public:
 #if defined(NDEBUG)
-    explicit MicrotaskQueueInvocationScope(CustomElementMicrotaskQueue*) { }
+    explicit MicrotaskQueueInvocationScope(CustomElementMicrotaskQueueBase*) { }
 #else
-    explicit MicrotaskQueueInvocationScope(CustomElementMicrotaskQueue* queue)
+    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;
-    CustomElementMicrotaskQueue* m_queue;
+    CustomElementMicrotaskQueueBase* m_queue;
 
     static MicrotaskQueueInvocationScope* s_top;
 #endif
 };
 
 #if !defined(NDEBUG)
 MicrotaskQueueInvocationScope* MicrotaskQueueInvocationScope::s_top = 0;
 #endif
 
-void CustomElementMicrotaskQueue::enqueue(PassOwnPtrWillBeRawPtr<CustomElementMicrotaskStep> step)
+void CustomElementMicrotaskQueueBase::dispatch()
 {
-    m_queue.append(step);
+    MicrotaskQueueInvocationScope scope(this);
+    doDispatch();
 }
 
-CustomElementMicrotaskStep::Result CustomElementMicrotaskQueue::dispatch()
-{
-    MicrotaskQueueInvocationScope scope(this);
-    WillBeHeapVector<OwnPtrWillBeMember<CustomElementMicrotaskStep> > remaining;
-    Result accumulatedResult = CustomElementMicrotaskStep::ContinueWithRemoving;
-
-    unsigned i;
-    for (i = 0; i < m_queue.size(); ++i) {
-        Result result = m_queue[i]->process();
-        accumulatedResult = CustomElementMicrotaskStep::Result(result | accumulatedResult);
-        if (result & CustomElementMicrotaskStep::ShouldRemain)
-            remaining.append(m_queue[i].release());
-        if (result & CustomElementMicrotaskStep::ShouldStop)
-            break;
-    }
-
-    for (++i; i < m_queue.size(); ++i)
-        remaining.append(m_queue[i].release());
-    m_queue.swap(remaining);
-
-    return accumulatedResult;
-}
-
-bool CustomElementMicrotaskQueue::needsProcessOrStop() const
-{
-    for (size_t i = 0; i < m_queue.size(); ++i) {
-        if (m_queue[i]->needsProcessOrStop())
-            return true;
-    }
-
-    return false;
-}
-
-void CustomElementMicrotaskQueue::trace(Visitor* visitor)
+void CustomElementMicrotaskQueueBase::trace(Visitor* visitor)
 {
     visitor->trace(m_queue);
 }
 
 #if !defined(NDEBUG)
-void CustomElementMicrotaskQueue::show(unsigned indent)
+void CustomElementMicrotaskQueueBase::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, "");
     }
 }
 #endif
 
+void CustomElementMicrotaskQueue::enqueue(PassOwnPtr<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