First step of HTMLImports

Source/core/html/parser/HTMLScriptRunner.cpp

 /*
  * Copyright (C) 2010 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 30 matching lines @@
 #include "core/platform/NotImplemented.h"
 
 namespace WebCore {
 
 using namespace HTMLNames;
 
 HTMLScriptRunner::HTMLScriptRunner(Document* document, HTMLScriptRunnerHost* host)
     : m_document(document)
     , m_host(host)
     , m_scriptNestingLevel(0)
-    , m_hasScriptsWaitingForStylesheets(false)
+    , m_hasScriptsWaitingForResources(false)
 {
     ASSERT(m_host);
 }
 
 HTMLScriptRunner::~HTMLScriptRunner()
 {
     // FIXME: Should we be passed a "done loading/parsing" callback sooner than destruction?
     if (m_parserBlockingScript.cachedScript() && m_parserBlockingScript.watchingForLoad())
         stopWatchingForLoad(m_parserBlockingScript);
 
@@ skipping 29 matching lines @@
         errorOccurred = script.cachedScript()->errorOccurred();
         ASSERT(script.cachedScript()->isLoaded());
         return ScriptSourceCode(script.cachedScript());
     }
     errorOccurred = false;
     return ScriptSourceCode(script.element()->textContent(), documentURLForScriptExecution(m_document), script.startingPosition());
 }
 
 bool HTMLScriptRunner::isPendingScriptReady(const PendingScript& script)
 {
-    m_hasScriptsWaitingForStylesheets = !m_document->haveStylesheetsLoaded();
-    if (m_hasScriptsWaitingForStylesheets)
+    m_hasScriptsWaitingForResources = !m_document->haveStylesheetsAndImportsLoaded();
+    if (m_hasScriptsWaitingForResources)
         return false;
     if (script.cachedScript() && !script.cachedScript()->isLoaded())
         return false;
     return true;
 }
 
 void HTMLScriptRunner::executeParsingBlockingScript()
 {
     ASSERT(m_document);
     ASSERT(!isExecutingScript());
-    ASSERT(m_document->haveStylesheetsLoaded());
+    ASSERT(m_document->haveStylesheetsAndImportsLoaded());
     ASSERT(isPendingScriptReady(m_parserBlockingScript));
 
     InsertionPointRecord insertionPointRecord(m_host->inputStream());
     executePendingScriptAndDispatchEvent(m_parserBlockingScript);
 }
 
 void HTMLScriptRunner::executePendingScriptAndDispatchEvent(PendingScript& pendingScript)
 {
     bool errorOccurred = false;
     ScriptSourceCode sourceCode = sourceFromPendingScript(pendingScript, errorOccurred);
@@ skipping 72 matching lines @@
 
 void HTMLScriptRunner::executeScriptsWaitingForLoad(CachedResource* cachedScript)
 {
     ASSERT(!isExecutingScript());
     ASSERT(hasParserBlockingScript());
     ASSERT_UNUSED(cachedScript, m_parserBlockingScript.cachedScript() == cachedScript);
     ASSERT(m_parserBlockingScript.cachedScript()->isLoaded());
     executeParsingBlockingScripts();
 }
 
-void HTMLScriptRunner::executeScriptsWaitingForStylesheets()
+void HTMLScriptRunner::executeScriptsWaitingForResources()
 {
     ASSERT(m_document);
-    // Callers should check hasScriptsWaitingForStylesheets() before calling
+    // Callers should check hasScriptsWaitingForResources() before calling
     // to prevent parser or script re-entry during </style> parsing.
-    ASSERT(hasScriptsWaitingForStylesheets());
+    ASSERT(hasScriptsWaitingForResources());
     ASSERT(!isExecutingScript());
-    ASSERT(m_document->haveStylesheetsLoaded());
+    ASSERT(m_document->haveStylesheetsAndImportsLoaded());
     executeParsingBlockingScripts();
 }
 
 bool HTMLScriptRunner::executeScriptsWaitingForParsing()
 {
     while (!m_scriptsToExecuteAfterParsing.isEmpty()) {
         ASSERT(!isExecutingScript());
         ASSERT(!hasParserBlockingScript());
         ASSERT(m_scriptsToExecuteAfterParsing.first().cachedScript());
         if (!m_scriptsToExecuteAfterParsing.first().cachedScript()->isLoaded()) {
@@ skipping 90 matching lines @@
             } else {
                 ScriptSourceCode sourceCode(script->textContent(), documentURLForScriptExecution(m_document), scriptStartPosition);
                 scriptElement->executeScript(sourceCode);
             }
         } else
             requestParsingBlockingScript(script);
     }
 }
 
 }