Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(733)

Unified Diff: Source/core/dom/custom/CustomElementScheduler.cpp

Issue 238923009: HTML Imports: No more BlockingDocumentCreation. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed the build breakage Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/dom/custom/CustomElementScheduler.cpp
diff --git a/Source/core/dom/custom/CustomElementScheduler.cpp b/Source/core/dom/custom/CustomElementScheduler.cpp
index 8ef09d9b788d79fdda0cd8b79bfa75a05bd8ddf1..4a8e394349ed8334f210bf9a72733a87698a768b 100644
--- a/Source/core/dom/custom/CustomElementScheduler.cpp
+++ b/Source/core/dom/custom/CustomElementScheduler.cpp
@@ -40,6 +40,7 @@
#include "core/dom/custom/CustomElementMicrotaskImportStep.h"
#include "core/dom/custom/CustomElementMicrotaskResolutionStep.h"
#include "core/dom/custom/CustomElementRegistrationContext.h"
+#include "core/dom/custom/RefCountedCustomElementMicrotaskQueue.h"
#include "core/html/imports/HTMLImportChild.h"
#include "core/html/imports/HTMLImportLoader.h"
@@ -76,7 +77,7 @@ void CustomElementScheduler::resolveOrScheduleResolution(PassRefPtr<CustomElemen
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)
@@ -84,12 +85,12 @@ CustomElementMicrotaskImportStep* CustomElementScheduler::scheduleImport(HTMLImp
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;
}

Powered by Google App Engine
This is Rietveld 408576698