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

Source/core/html/imports/HTMLImportStateResolver.cpp

Index: Source/core/html/imports/HTMLImportStateResolver.cpp
===================================================================
--- Source/core/html/imports/HTMLImportStateResolver.cpp	(revision 174593)
+++ Source/core/html/imports/HTMLImportStateResolver.cpp	(working copy)
@@ -32,6 +32,7 @@
 #include "core/html/imports/HTMLImportStateResolver.h"
 
 #include "core/html/imports/HTMLImport.h"
+#include "core/html/imports/HTMLImportChild.h"
 
 namespace WebCore {
 
@@ -39,6 +40,8 @@
 {
     if (!import->isSync())
         return false;
+    if (!toHTMLImportChild(import)->isFirst())
+        return false;
     if (!import->loader())
         return true;
     return !import->state().isReady();
@@ -46,9 +49,12 @@
 
 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()) {