Remove the concept of pendingScripts from HTMLScriptRunner

sky/engine/core/html/parser/HTMLDocumentParser.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 41 matching lines @@
     , m_haveBackgroundParser(false)
     , m_pumpSessionNestingLevel(0)
 {
 }
 
 HTMLDocumentParser::~HTMLDocumentParser()
 {
     ASSERT(!m_parserScheduler);
     ASSERT(!m_pumpSessionNestingLevel);
     ASSERT(!m_haveBackgroundParser);
-    // FIXME: We should be able to ASSERT(m_speculations.isEmpty()),
+    // FIXME: We should be able to ASSERT(m_pendingChunks.isEmpty()),
     // but there are cases where that's not true currently. For example,
     // we we're told to stop parsing before we've consumed all the input.
 }
 
 void HTMLDocumentParser::parse(mojo::ScopedDataPipeConsumerHandle source,
                                const base::Closure& completionCallback)
 {
     ASSERT(!isStopped());
     ASSERT(!m_haveBackgroundParser);
     m_haveBackgroundParser = true;
@@ skipping 70 matching lines @@
 }
 
 // Used by HTMLParserScheduler
 void HTMLDocumentParser::resumeParsingAfterYield()
 {
     // pumpTokenizer can cause this parser to be detached from the Document,
     // but we need to ensure it isn't deleted yet.
     RefPtr<HTMLDocumentParser> protect(this);
 
     ASSERT(m_haveBackgroundParser);
-    pumpPendingSpeculations();
+    pumpPendingChunks();
 }
 
 void HTMLDocumentParser::runScriptsForPausedTreeBuilder()
 {
     if (m_isFragment)
         return;
     TextPosition scriptStartPosition = TextPosition::belowRangePosition();
     RefPtr<Element> scriptToProcess = m_treeBuilder->takeScriptToProcess(scriptStartPosition);
     m_scriptRunner.runScript(toHTMLScriptElement(scriptToProcess.get()), scriptStartPosition);
 }
 
 void HTMLDocumentParser::didReceiveParsedChunkFromBackgroundParser(PassOwnPtr<ParsedChunk> chunk)
 {
     TRACE_EVENT0("blink", "HTMLDocumentParser::didReceiveParsedChunkFromBackgroundParser");
+    // Sky should not need nested parsers.
+    ASSERT(document()->activeParserCount() == 0);
 
-    // alert(), runModalDialog, and the JavaScript Debugger all run nested event loops
-    // which can cause this method to be re-entered. We detect re-entry using
-    // hasActiveParser(), save the chunk as a speculation, and return.
-    if (isWaitingForScripts() || !m_speculations.isEmpty() || document()->activeParserCount() > 0) {
-        m_speculations.append(chunk);
+    if (isWaitingForScripts() || !m_pendingChunks.isEmpty() || document()->activeParserCount() > 0 || !document()->haveImportsLoaded()) {
+        m_pendingChunks.append(chunk);
         return;
     }
 
     // processParsedChunkFromBackgroundParser can cause this parser to be detached from the Document,
     // but we need to ensure it isn't deleted yet.
     RefPtr<HTMLDocumentParser> protect(this);
 
-    ASSERT(m_speculations.isEmpty());
-    m_speculations.append(chunk);
-    pumpPendingSpeculations();
+    ASSERT(m_pendingChunks.isEmpty());
+    m_pendingChunks.append(chunk);
+    pumpPendingChunks();
 }
 
 void HTMLDocumentParser::processParsedChunkFromBackgroundParser(PassOwnPtr<ParsedChunk> popChunk)
 {
+    // TODO(eseidel): Include the token count in the trace event.
     TRACE_EVENT0("blink", "HTMLDocumentParser::processParsedChunkFromBackgroundParser");
 
     ASSERT_WITH_SECURITY_IMPLICATION(!document()->activeParserCount());
     ASSERT(!isParsingFragment());
     ASSERT(!isWaitingForScripts());
     ASSERT(!isStopped());
 
     // ASSERT that this object is both attached to the Document and protected.
     ASSERT(refCount() >= 2);
 
@@ skipping 13 matching lines @@
             break;
 
         if (isWaitingForScripts()) {
             ASSERT(it + 1 == tokens->end()); // The </script> is assumed to be the last token of this bunch.
             runScriptsForPausedTreeBuilder();
             break;
         }
 
         if (it->type() == HTMLToken::EndOfFile) {
             ASSERT(it + 1 == tokens->end()); // The EOF is assumed to be the last token of this bunch.
-            ASSERT(m_speculations.isEmpty()); // There should never be any chunks after the EOF.
+            ASSERT(m_pendingChunks.isEmpty()); // There should never be any chunks after the EOF.
             prepareToStopParsing();
             break;
         }
     }
 
     // Make sure any pending text nodes are emitted before returning.
     if (!isStopped())
         m_treeBuilder->flush();
 }
 
-void HTMLDocumentParser::pumpPendingSpeculations()
+void HTMLDocumentParser::pumpPendingChunks()
 {
     // FIXME: Share this constant with the parser scheduler.
     const double parserTimeLimit = 0.500;
 
     // ASSERT that this object is both attached to the Document and protected.
     ASSERT(refCount() >= 2);
     ASSERT(!isWaitingForScripts());
     ASSERT(!isStopped());
+    ASSERT(document()->haveImportsLoaded());
 
     double startTime = currentTime();
 
-    while (!m_speculations.isEmpty()) {
-        processParsedChunkFromBackgroundParser(m_speculations.takeFirst());
+    while (!m_pendingChunks.isEmpty()) {
+        processParsedChunkFromBackgroundParser(m_pendingChunks.takeFirst());
 
         // Always check isStopped first as m_document may be null.
         if (isStopped() || isWaitingForScripts() || !document()->haveImportsLoaded())
             break;
 
-        if (currentTime() - startTime > parserTimeLimit && !m_speculations.isEmpty()) {
+        if (currentTime() - startTime > parserTimeLimit && !m_pendingChunks.isEmpty()) {
             m_parserScheduler->scheduleForResume();
             break;
         }
     }
 }
 
 Document* HTMLDocumentParser::contextForParsingSession()
 {
     // The parsing session should interact with the document only when parsing
     // non-fragments. Otherwise, we might delay the load event mistakenly.
@@ skipping 100 matching lines @@
 }
 
 TextPosition HTMLDocumentParser::textPosition() const
 {
     ASSERT(m_haveBackgroundParser);
     return m_textPosition;
 }
 
 bool HTMLDocumentParser::isWaitingForScripts() const
 {
-    return m_treeBuilder->hasParserBlockingScript() || m_scriptRunner.hasPendingScripts();
+    return m_treeBuilder->hasParserBlockingScript();
 }
 
 void HTMLDocumentParser::resumeAfterWaitingForImports()
 {
     RefPtr<HTMLDocumentParser> protect(this);
-    if (m_scriptRunner.hasPendingScripts())
-        m_scriptRunner.executePendingScripts();
     ASSERT(!isExecutingScript());
     ASSERT(!isWaitingForScripts());
-    if (m_speculations.isEmpty())
+    if (m_pendingChunks.isEmpty())
         return;
     ASSERT(m_haveBackgroundParser);
-    pumpPendingSpeculations();
+    pumpPendingChunks();
 }
 
 }