Revert 169577 "[HTML Import] Let script block by pending resourc..."

trunk/Source/core/dom/Document.cpp

Index: trunk/Source/core/dom/Document.cpp
===================================================================
--- trunk/Source/core/dom/Document.cpp	(revision 169768)
+++ trunk/Source/core/dom/Document.cpp	(working copy)
@@ -816,6 +816,11 @@
     m_import = import;
 }
 
+void Document::didLoadAllImports()
+{
+    executeScriptsWaitingForResourcesIfNeeded();
+}
+
 bool Document::haveImportsLoaded() const
 {
     return !m_import || !m_import->state().shouldBlockScriptExecution();
@@ -2840,37 +2845,20 @@
     return 0;
 }
 
-void Document::didLoadAllImports()
-{
-    if (!haveStylesheetsLoaded())
-        return;
-
-    didLoadAllScriptBlockingResources();
-}
-
 void Document::didRemoveAllPendingStylesheet()
 {
     m_needsNotifyRemoveAllPendingStylesheet = false;
 
     styleResolverChanged(RecalcStyleDeferred, hasNodesWithPlaceholderStyle() ? FullStyleUpdate : AnalyzedStyleUpdate);
-
-    if (m_import)
-        m_import->didRemoveAllPendingStylesheet();
-    if (!haveImportsLoaded())
-        return;
-
-    didLoadAllScriptBlockingResources();
-}
-
-void Document::didLoadAllScriptBlockingResources()
-{
     executeScriptsWaitingForResourcesIfNeeded();
 
     if (m_gotoAnchorNeededAfterStylesheetsLoad && view())
         view()->scrollToFragment(m_url);
+
+    if (m_import)
+        m_import->didRemoveAllPendingStylesheet();
 }
 
-
 void Document::executeScriptsWaitingForResourcesIfNeeded()
 {
     if (!haveStylesheetsAndImportsLoaded())