HTML Imports: Make sure new imports being added to the "first child"

Source/core/html/imports/HTMLImportLoader.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 164 matching lines @@
 void HTMLImportLoader::didFinishLoading()
 {
     for (size_t i = 0; i < m_imports.size(); ++i)
         m_imports[i]->didFinishLoading();
 
     clearResource();
 
     ASSERT(!m_importedDocument || !m_importedDocument->parsing());
 }
 
+void HTMLImportLoader::moveToFirst(HTMLImportChild* import)
+{
+    size_t position = m_imports.find(import);
+    ASSERT(kNotFound != position);
+    m_imports.remove(position);
+    m_imports.insert(0, import);
+}
+
 void HTMLImportLoader::addImport(HTMLImportChild* import)
 {
     ASSERT(kNotFound == m_imports.find(import));
 
-    // Ensuring firstImport() manages all children that is loaded by the document.
-    //
-    // FIXME:
-    //   This is a design flaw.
-    //   Import children should be managed by HTMLImportLoader, not by HTMLImport.
-    if (!m_imports.isEmpty() && import->precedes(firstImport())) {
-        import->takeChildrenFrom(firstImport());
-        m_imports.insert(0, import);
-    } else {
-        m_imports.append(import);
-    }
-
+    m_imports.append(import);
+    import->normalize();
     if (isDone())
         import->didFinishLoading();
 }
 
 void HTMLImportLoader::removeImport(HTMLImportChild* client)
 {
     ASSERT(kNotFound != m_imports.find(client));
     m_imports.remove(m_imports.find(client));
 }
 
 bool HTMLImportLoader::shouldBlockScriptExecution() const
 {
     for (size_t i = 0; i < m_imports.size(); ++i) {
         if (!m_imports[i]->state().shouldBlockScriptExecution())
             return false;
     }
 
     return true;
 }
 
 PassRefPtr<CustomElementMicrotaskQueue> HTMLImportLoader::microtaskQueue() const
 {
     return m_microtaskQueue;
 }
 
 } // namespace WebCore