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

Unified Diff: sky/engine/core/html/imports/HTMLImportChild.cpp

Issue 950523002: Delete sky/engine/core/dom/custom (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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
« no previous file with comments | « sky/engine/core/html/imports/HTMLImportChild.h ('k') | sky/engine/core/html/imports/HTMLImportLoader.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/html/imports/HTMLImportChild.cpp
diff --git a/sky/engine/core/html/imports/HTMLImportChild.cpp b/sky/engine/core/html/imports/HTMLImportChild.cpp
index a48fe147d9942987a8ca78887b8672c335b8e47b..cc9ab168c6c521934dcb02219883b67016080cbb 100644
--- a/sky/engine/core/html/imports/HTMLImportChild.cpp
+++ b/sky/engine/core/html/imports/HTMLImportChild.cpp
@@ -32,9 +32,6 @@
#include "sky/engine/core/html/imports/HTMLImportChild.h"
#include "sky/engine/core/dom/Document.h"
-#include "sky/engine/core/dom/custom/CustomElement.h"
-#include "sky/engine/core/dom/custom/CustomElementMicrotaskImportStep.h"
-#include "sky/engine/core/dom/custom/CustomElementSyncMicrotaskQueue.h"
#include "sky/engine/core/html/imports/HTMLImportChildClient.h"
#include "sky/engine/core/html/imports/HTMLImportLoader.h"
#include "sky/engine/core/html/imports/HTMLImportTreeRoot.h"
@@ -73,13 +70,11 @@ void HTMLImportChild::ownerInserted()
void HTMLImportChild::didShareLoader()
{
- createCustomElementMicrotaskStepIfNeeded();
stateWillChange();
}
void HTMLImportChild::didStartLoading()
{
- createCustomElementMicrotaskStepIfNeeded();
}
void HTMLImportChild::didFinish()
@@ -91,13 +86,6 @@ void HTMLImportChild::didFinish()
void HTMLImportChild::didFinishLoading()
{
stateWillChange();
- CustomElement::didFinishLoadingImport(*(root()->document()));
-}
-
-void HTMLImportChild::didFinishUpgradingCustomElements()
-{
- stateWillChange();
- m_customElementMicrotaskStep.clear();
}
#if !ENABLE(OILPAN)
@@ -137,32 +125,10 @@ void HTMLImportChild::stateDidChange()
didFinish();
}
-void HTMLImportChild::invalidateCustomElementMicrotaskStep()
-{
- if (!m_customElementMicrotaskStep)
- return;
- m_customElementMicrotaskStep->invalidate();
- m_customElementMicrotaskStep.clear();
-}
-
-void HTMLImportChild::createCustomElementMicrotaskStepIfNeeded()
-{
- ASSERT(!m_customElementMicrotaskStep);
-
- if (!isDone() && !formsCycle()) {
-#if ENABLE(OILPAN)
- m_customElementMicrotaskStep = CustomElement::didCreateImport(this);
-#else
- m_customElementMicrotaskStep = CustomElement::didCreateImport(this)->weakPtr();
-#endif
- }
-}
-
bool HTMLImportChild::isDone() const
{
ASSERT(m_loader);
-
- return m_loader->isDone() && m_loader->microtaskQueue()->isEmpty() && !m_customElementMicrotaskStep;
+ return m_loader->isDone();
}
HTMLImportLoader* HTMLImportChild::loader() const
@@ -206,11 +172,8 @@ void HTMLImportChild::normalize()
takeChildrenFrom(oldFirst);
}
- for (HTMLImportChild* child = toHTMLImportChild(firstChild()); child; child = toHTMLImportChild(child->next())) {
- if (child->formsCycle())
- child->invalidateCustomElementMicrotaskStep();
+ for (HTMLImportChild* child = toHTMLImportChild(firstChild()); child; child = toHTMLImportChild(child->next()))
child->normalize();
- }
}
#if !defined(NDEBUG)
@@ -218,10 +181,9 @@ void HTMLImportChild::showThis()
{
bool isFirst = loader() ? loader()->isFirstImport(this) : false;
HTMLImport::showThis();
- fprintf(stderr, " loader=%p first=%d, step=%p sync=%s url=%s",
+ fprintf(stderr, " loader=%p first=%d, sync=%s url=%s",
m_loader.get(),
isFirst,
- m_customElementMicrotaskStep.get(),
isSync() ? "Y" : "N",
url().string().utf8().data());
}
« no previous file with comments | « sky/engine/core/html/imports/HTMLImportChild.h ('k') | sky/engine/core/html/imports/HTMLImportLoader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698