Merge 174141 "HTML Imports: Take care of cycles according to the..."

Source/core/html/imports/HTMLImportChild.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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 96 matching lines @@
 {
     stateWillChange();
     m_customElementMicrotaskStep.clear();
 }
 
 bool HTMLImportChild::isLoaded() const
 {
     return m_loader && m_loader->isDone();
 }
 
+bool HTMLImportChild::isFirst() const
+{
+    return m_loader && m_loader->isFirstImport(this);
+}
+
 Document* HTMLImportChild::importedDocument() const
 {
     if (!m_loader)
         return 0;
     return m_loader->importedDocument();
 }
 
 void HTMLImportChild::importDestroyed()
 {
     if (parent())
@@ skipping 16 matching lines @@
 
 void HTMLImportChild::stateDidChange()
 {
     HTMLImport::stateDidChange();
 
     ensureLoader();
     if (state().isReady())
         didFinish();
 }
 
+void HTMLImportChild::createCustomElementMicrotaskStepIfNeeded()
+{
+    // HTMLImportChild::normalize(), which is called from HTMLImportLoader::addImport(),
+    // can move import children to new parents. So their microtask steps should be updated as well,
+    // to let the steps be in the new parent queues.This method handles such migration.
+    // For implementation simplicity, outdated step objects that are owned by moved children
+    // aren't removed from the (now wrong) queues. Instead, each step invalidates its content so that
+    // it is removed from the wrong queue during the next traversal. See parentWasChanged() for the detail.
+
+    if (m_customElementMicrotaskStep) {
+        m_customElementMicrotaskStep->parentWasChanged();
+        m_customElementMicrotaskStep.clear();
+    }
+
+    if (!isDone() && !formsCycle()) {
+        m_customElementMicrotaskStep = CustomElement::didCreateImport(this)->weakPtr();
+    }
+
+    for (HTMLImport* child = firstChild(); child; child = child->next())
+        toHTMLImportChild(child)->createCustomElementMicrotaskStepIfNeeded();
+}
+
 void HTMLImportChild::ensureLoader()
 {
     if (m_loader)
         return;
 
     if (HTMLImportChild* found = toHTMLImportsController(root())->findLinkFor(m_url, this))
         shareLoader(found);
     else
         createLoader();
 
-    if (!isDone() && !formsCycle()) {
-        ASSERT(!m_customElementMicrotaskStep);
-        m_customElementMicrotaskStep = CustomElement::didCreateImport(this)->weakPtr();
-    }
+    createCustomElementMicrotaskStepIfNeeded();
 }
 
 void HTMLImportChild::createLoader()
 {
     ASSERT(!m_loader);
     m_loader = toHTMLImportsController(root())->createLoader();
     m_loader->addImport(this);
     m_loader->startLoading(resource());
 }
 
@@ skipping 60 matching lines @@
     fprintf(stderr, " loader=%p first=%d, step=%p sync=%s url=%s",
         m_loader,
         isFirst,
         m_customElementMicrotaskStep.get(),
         isSync() ? "Y" : "N",
         url().string().utf8().data());
 }
 #endif
 
 } // namespace WebCore