REGRESSION(r171966): Custom elements in async imports don't get upgrade.

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 44 matching lines @@
 #if !ENABLE(OILPAN)
     m_master.guardRef();
 #endif
 }
 
 HTMLImportChild::~HTMLImportChild()
 {
     // importDestroyed() should be called before the destruction.
     ASSERT(!m_loader);
 
-    if (m_customElementMicrotaskStep) {
-        // if Custom Elements were blocked, must unblock them before death
-        m_customElementMicrotaskStep->importDidFinish();
-        m_customElementMicrotaskStep = 0;
-    }
+    if (m_customElementMicrotaskStep)
+        m_customElementMicrotaskStep->importWasDestroyed();
 
     if (m_client)
         m_client->importChildWasDestroyed(this);
 
 #if !ENABLE(OILPAN)
     m_master.guardDeref();
 #endif
 }
 
 void HTMLImportChild::wasAlreadyLoaded()
@@ skipping 12 matching lines @@
     setResource(resource);
 
     ensureLoader();
 }
 
 void HTMLImportChild::didFinish()
 {
     if (m_client)
         m_client->didFinish();
 
-    if (m_customElementMicrotaskStep) {
-        m_customElementMicrotaskStep->importDidFinish();
-        m_customElementMicrotaskStep = 0;
-    }
+    ASSERT(!m_customElementMicrotaskStep);
 }
 
 void HTMLImportChild::didFinishLoading()
 {
+    // This triggers closing handshake between CustomElementMicrotaskImportStep.
+    // It eventually tells back through didFinishMicrotask(), then this import becomes "done".
+    if (m_customElementMicrotaskStep)
+        m_customElementMicrotaskStep->importDidLoad(this);
     clearResource();
     stateWillChange();
 }
 
+void HTMLImportChild::didFinishMicrotask()
+{
+    m_customElementMicrotaskStep = 0;
+    stateWillChange();
+}
+
 Document* HTMLImportChild::importedDocument() const
 {
     if (!m_loader)
         return 0;
     return m_loader->importedDocument();
 }
 
 void HTMLImportChild::importDestroyed()
 {
     if (parent())
@@ skipping 26 matching lines @@
 void HTMLImportChild::ensureLoader()
 {
     if (m_loader)
         return;
 
     if (HTMLImportChild* found = toHTMLImportsController(root())->findLinkFor(m_url, this))
         shareLoader(found);
     else
         createLoader();
 
-    if (isSync() && !isDone()) {
+    if (!isDone() && !formsCycle()) {
         ASSERT(!m_customElementMicrotaskStep);
         m_customElementMicrotaskStep = CustomElement::didCreateImport(this);
     }
 }
 
 void HTMLImportChild::createLoader()
 {
     ASSERT(!m_loader);
     m_loader = toHTMLImportsController(root())->createLoader();
     m_loader->addImport(this);
     m_loader->startLoading(resource());
 }
 
 void HTMLImportChild::shareLoader(HTMLImportChild* loader)
 {
     ASSERT(!m_loader);
     m_loader = loader->m_loader;
     m_loader->addImport(this);
     stateWillChange();
 }
 
 bool HTMLImportChild::isDone() const
 {
-    return m_loader && m_loader->isDone();
+    return m_loader && m_loader->isDone() && !m_customElementMicrotaskStep;
 }
 
 bool HTMLImportChild::loaderHasError() const
 {
     return m_loader && m_loader->hasError();
 }
 
 
 void HTMLImportChild::setClient(HTMLImportChildClient* client)
 {
@@ skipping 21 matching lines @@
 {
     HTMLImport::showThis();
     fprintf(stderr, " loader=%p sync=%s url=%s",
         m_loader,
         isSync() ? "Y" : "N",
         url().string().utf8().data());
 }
 #endif
 
 } // namespace WebCore