Separate Custom Element resolution and upgrade/createdCallback.

Source/core/dom/custom/CustomElementScheduler.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 18 matching lines @@
  */
 
 #include "config.h"
 #include "core/dom/custom/CustomElementScheduler.h"
 
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/dom/custom/CustomElementCallbackDispatcher.h"
 #include "core/dom/custom/CustomElementCallbackInvocation.h"
 #include "core/dom/custom/CustomElementLifecycleCallbacks.h"
-#include "core/dom/custom/CustomElementMicrotaskElementStep.h"
 #include "core/dom/custom/CustomElementMicrotaskImportStep.h"
+#include "core/dom/custom/CustomElementMicrotaskResolutionStep.h"
 #include "core/dom/custom/CustomElementRegistrationContext.h"
-#include "core/dom/custom/CustomElementResolutionStep.h"
-#include "core/html/HTMLImport.h"
 #include "core/html/HTMLImportChild.h"
 #include "wtf/MainThread.h"
 
 namespace WebCore {
 
+class HTMLImport;
+
+void CustomElementScheduler::scheduleCreatedCallback(PassRefPtr<CustomElementLifecycleCallbacks> callbacks, PassRefPtr<Element> element)
+{
+    CustomElementCallbackQueue* queue = instance().schedule(element);
+    queue->append(CustomElementCallbackInvocation::createInvocation(callbacks, CustomElementLifecycleCallbacks::Created));
+}
+
 void CustomElementScheduler::scheduleAttributeChangedCallback(PassRefPtr<CustomElementLifecycleCallbacks> callbacks, PassRefPtr<Element> element, const AtomicString& name, const AtomicString& oldValue, const AtomicString& newValue)
 {
     if (!callbacks->hasAttributeChangedCallback())
         return;
 
     CustomElementCallbackQueue* queue = instance().schedule(element);
     queue->append(CustomElementCallbackInvocation::createAttributeChangedInvocation(callbacks, name, oldValue, newValue));
 }
 
 void CustomElementScheduler::scheduleAttachedCallback(PassRefPtr<CustomElementLifecycleCallbacks> callbacks, PassRefPtr<Element> element)
 {
     if (!callbacks->hasAttachedCallback())
         return;
 
     CustomElementCallbackQueue* queue = instance().schedule(element);
     queue->append(CustomElementCallbackInvocation::createInvocation(callbacks, CustomElementLifecycleCallbacks::Attached));
 }
 
 void CustomElementScheduler::scheduleDetachedCallback(PassRefPtr<CustomElementLifecycleCallbacks> callbacks, PassRefPtr<Element> element)
 {
     if (!callbacks->hasDetachedCallback())
         return;
 
     CustomElementCallbackQueue* queue = instance().schedule(element);
     queue->append(CustomElementCallbackInvocation::createInvocation(callbacks, CustomElementLifecycleCallbacks::Detached));
 }
 
-void CustomElementScheduler::scheduleResolutionStep(const CustomElementDescriptor& descriptor, PassRefPtr<Element> element)
+void CustomElementScheduler::resolveOrScheduleResolution(PassRefPtr<CustomElementRegistrationContext> context, PassRefPtr<Element> element, const CustomElementDescriptor& descriptor)
 {
-    RefPtr<CustomElementRegistrationContext> context = element->document().registrationContext();
-    CustomElementCallbackQueue* queue = instance().schedule(element);
-    queue->append(CustomElementResolutionStep::create(context.release(), descriptor));
+    if (CustomElementCallbackDispatcher::inCallbackDeliveryScope()) {
+        context->resolve(element.get(), descriptor);
+        return;
+    }
+
+    HTMLImport* import = element->document().import();
+    OwnPtr<CustomElementMicrotaskResolutionStep> step = CustomElementMicrotaskResolutionStep::create(context, element, descriptor);
+    instance().m_microtaskDispatcher.enqueue(import, step.release());
 }
 
 CustomElementMicrotaskImportStep* CustomElementScheduler::scheduleImport(HTMLImportChild* import)
 {
     ASSERT(!import->isDone());
     ASSERT(import->parent());
 
     OwnPtr<CustomElementMicrotaskImportStep> step = CustomElementMicrotaskImportStep::create();
     CustomElementMicrotaskImportStep* rawStep = step.get();
 
     // Ownership of the new step is transferred to the parent
     // processing step, or the base queue.
-    if (CustomElementMicrotaskImportStep* parentStep = import->parent()->customElementMicrotaskStep())
-        parentStep->enqueue(step.release());
-    else
-        instance().m_baseMicrotaskQueue.enqueue(step.release());
+    instance().m_microtaskDispatcher.enqueue(import->parent(), step.release());
 
     return rawStep;
 }
 
 CustomElementScheduler& CustomElementScheduler::instance()
 {
     DEFINE_STATIC_LOCAL(CustomElementScheduler, instance, ());
     return instance;
 }
 
@@ skipping 25 matching lines @@
         // element.
         return callbackQueue;
     }
 
     if (CustomElementCallbackDispatcher::inCallbackDeliveryScope()) {
         // The processing stack is active.
         CustomElementCallbackDispatcher::instance().enqueue(callbackQueue);
         return callbackQueue;
     }
 
-    HTMLImport* import = element->document().import();
-    if (import && import->customElementMicrotaskStep()) {
-        // The base element queue is active, but the element is in a
-        // parser-created import.
-        import->customElementMicrotaskStep()->enqueue(CustomElementMicrotaskElementStep::create(callbackQueue));
-        return callbackQueue;
-    }
-
-    // The base element queue is active. The element is not in a
-    // parser-created import.
-    m_baseMicrotaskQueue.enqueue(CustomElementMicrotaskElementStep::create(callbackQueue));
+    m_microtaskDispatcher.enqueue(callbackQueue);
     return callbackQueue;
 }
 
 bool CustomElementScheduler::dispatch()
 {
     ASSERT(isMainThread());
     if (CustomElementCallbackDispatcher::inCallbackDeliveryScope())
         return false;
 
-    CustomElementMicrotaskStep::Result result = m_baseMicrotaskQueue.dispatch();
-    if (m_baseMicrotaskQueue.isEmpty())
-        clearElementCallbackQueueMap();
-
-    return result & CustomElementMicrotaskStep::DidWork;
+    bool didWork = m_microtaskDispatcher.dispatch();
+    ASSERT(m_microtaskDispatcher.elementQueueIsEmpty());
+    clearElementCallbackQueueMap();
+    return didWork;
 }
 
 } // namespace WebCore