HTML Imports: No more BlockingDocumentCreation.

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 20 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/CustomElementMicrotaskDispatcher.h"
 #include "core/dom/custom/CustomElementMicrotaskImportStep.h"
+#include "core/dom/custom/CustomElementMicrotaskQueue.h"
 #include "core/dom/custom/CustomElementMicrotaskResolutionStep.h"
 #include "core/dom/custom/CustomElementRegistrationContext.h"
 #include "core/html/imports/HTMLImportChild.h"
 #include "core/html/imports/HTMLImportLoader.h"
 
 namespace WebCore {
 
 class HTMLImport;
 
 void CustomElementScheduler::scheduleCallback(PassRefPtr<CustomElementLifecycleCallbacks> callbacks, PassRefPtr<Element> element, CustomElementLifecycleCallbacks::CallbackType type)
@@ skipping 18 matching lines @@
 
 void CustomElementScheduler::resolveOrScheduleResolution(PassRefPtr<CustomElementRegistrationContext> context, PassRefPtr<Element> element, const CustomElementDescriptor& descriptor)
 {
     if (CustomElementCallbackDispatcher::inCallbackDeliveryScope()) {
         context->resolve(element.get(), descriptor);
         return;
     }
 
     HTMLImportLoader* loader = element->document().importLoader();
     OwnPtr<CustomElementMicrotaskResolutionStep> step = CustomElementMicrotaskResolutionStep::create(context, element, descriptor);
-    CustomElementMicrotaskDispatcher::instance().enqueue(loader ? loader->firstImport() : 0, step.release());
+    CustomElementMicrotaskDispatcher::instance().enqueue(loader, step.release());
 }
 
 CustomElementMicrotaskImportStep* CustomElementScheduler::scheduleImport(HTMLImportChild* import)
 {
     ASSERT(!import->isDone());
     ASSERT(import->parent());
 
-    OwnPtr<CustomElementMicrotaskImportStep> step = CustomElementMicrotaskImportStep::create();
+    OwnPtr<CustomElementMicrotaskImportStep> step = CustomElementMicrotaskImportStep::create(import->loader()->microtaskQueue());
     CustomElementMicrotaskImportStep* rawStep = step.get();
 
     // Ownership of the new step is transferred to the parent
     // processing step, or the base queue.
-    CustomElementMicrotaskDispatcher::instance().enqueue(import->parent(), step.release());
+    CustomElementMicrotaskDispatcher::instance().enqueue(import->parent()->loader(), step.release());
 
     return rawStep;
 }
 
 CustomElementScheduler& CustomElementScheduler::instance()
 {
     DEFINE_STATIC_LOCAL(CustomElementScheduler, instance, ());
     return instance;
 }
 
@@ skipping 41 matching lines @@
         // The processing stack is active.
         CustomElementCallbackDispatcher::instance().enqueue(&callbackQueue);
         return callbackQueue;
     }
 
     CustomElementMicrotaskDispatcher::instance().enqueue(&callbackQueue);
     return callbackQueue;
 }
 
 } // namespace WebCore