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

Source/core/html/imports/HTMLImportStateResolver.cpp

 /*
  * Copyright (C) 2014 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 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/html/imports/HTMLImportStateResolver.h"
 
 #include "core/html/imports/HTMLImport.h"
+#include "core/html/imports/HTMLImportChild.h"
 
 namespace WebCore {
 
 inline bool HTMLImportStateResolver::isBlockingFollowers(HTMLImport* import)
 {
     if (!import->isSync())
         return false;
+    if (!toHTMLImportChild(import)->isFirst())
+        return false;
     if (!import->loader())
         return true;
     return !import->state().isReady();
 }
 
 inline bool HTMLImportStateResolver::shouldBlockScriptExecution() const
 {
-    for (const HTMLImport* ancestor = m_import; ancestor; ancestor = ancestor->parent()) {
-        if (ancestor->previous() && isBlockingFollowers(ancestor->previous()))
-            return true;
+    // FIXME: Memoize to make this faster.
+    for (HTMLImport* ancestor = m_import; ancestor; ancestor = ancestor->parent()) {
+        for (HTMLImport* predecessor = ancestor->previous(); predecessor; predecessor = predecessor->previous()) {
+            if (isBlockingFollowers(predecessor))
+                return true;
+        }
     }
 
     for (HTMLImport* child = m_import->firstChild(); child; child = child->next()) {
         if (isBlockingFollowers(child))
             return true;
     }
 
     return false;
 }
 
 inline bool HTMLImportStateResolver::isActive() const
 {
     return !m_import->isDone();
 }
 
 HTMLImportState HTMLImportStateResolver::resolve() const
 {
     if (shouldBlockScriptExecution())
         return HTMLImportState(HTMLImportState::BlockingScriptExecution);
     if (isActive())
         return HTMLImportState(HTMLImportState::Active);
     return HTMLImportState(HTMLImportState::Ready);
 }
 
 }