The Sky parser should yield before start tags

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 40 matching lines @@
     , m_weakFactory(this)
     , m_isFragment(false)
     , m_endWasDelayed(false)
     , m_haveBackgroundParser(false)
     , m_pumpSessionNestingLevel(0)
 {
 }
 
 HTMLDocumentParser::~HTMLDocumentParser()
 {
-#if ENABLE(OILPAN)
-    if (m_haveBackgroundParser)
-        stopBackgroundParser();
-    // In Oilpan, HTMLDocumentParser can die together with Document, and
-    // detach() is not called in this case.
-#else
     ASSERT(!m_parserScheduler);
     ASSERT(!m_pumpSessionNestingLevel);
     ASSERT(!m_haveBackgroundParser);
     // FIXME: We should be able to ASSERT(m_speculations.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.
-#endif
 }
 
 void HTMLDocumentParser::parse(mojo::ScopedDataPipeConsumerHandle source,
                                const base::Closure& completionCallback)
 {
     ASSERT(!isStopped());
     ASSERT(!m_haveBackgroundParser);
     m_haveBackgroundParser = true;
 
     m_completionCallback = completionCallback;
@@ skipping 101 matching lines @@
 
     // 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();
 }
 
-void HTMLDocumentParser::validateSpeculations(PassOwnPtr<ParsedChunk> chunk)
-{
-    ASSERT(chunk);
-    if (isWaitingForScripts()) {
-        // We're waiting on a network script, just save the chunk, we'll get
-        // a second validateSpeculations call after the script completes.
-        // This call should have been made immediately after runScriptsForPausedTreeBuilder
-        // which may have started a network load and left us waiting.
-        ASSERT(!m_lastChunkBeforeScript);
-        m_lastChunkBeforeScript = chunk;
-        return;
-    }
-}
-
 void HTMLDocumentParser::processParsedChunkFromBackgroundParser(PassOwnPtr<ParsedChunk> popChunk)
 {
     TRACE_EVENT0("blink", "HTMLDocumentParser::processParsedChunkFromBackgroundParser");
 
     ASSERT_WITH_SECURITY_IMPLICATION(!document()->activeParserCount());
     ASSERT(!isParsingFragment());
     ASSERT(!isWaitingForScripts());
     ASSERT(!isStopped());
-#if !ENABLE(OILPAN)
+
     // ASSERT that this object is both attached to the Document and protected.
     ASSERT(refCount() >= 2);
-#endif
-    ASSERT(!m_lastChunkBeforeScript);
 
     ActiveParserSession session(contextForParsingSession());
 
     OwnPtr<ParsedChunk> chunk(popChunk);
     OwnPtr<CompactHTMLTokenStream> tokens = chunk->tokens.release();
 
     for (Vector<CompactHTMLToken>::const_iterator it = tokens->begin(); it != tokens->end(); ++it) {
         ASSERT(!isWaitingForScripts());
 
         m_textPosition = it->textPosition();
 
         constructTreeFromCompactHTMLToken(*it);
 
         if (isStopped())
             break;
 
         if (isWaitingForScripts()) {
             ASSERT(it + 1 == tokens->end()); // The </script> is assumed to be the last token of this bunch.
             runScriptsForPausedTreeBuilder();
-            validateSpeculations(chunk.release());
             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.
             prepareToStopParsing();
             break;
         }
     }
 
     // Make sure any pending text nodes are emitted before returning.
     if (!isStopped())
         m_treeBuilder->flush();
 }
 
 void HTMLDocumentParser::pumpPendingSpeculations()
 {
     // FIXME: Share this constant with the parser scheduler.
     const double parserTimeLimit = 0.500;
 
-#if !ENABLE(OILPAN)
     // ASSERT that this object is both attached to the Document and protected.
     ASSERT(refCount() >= 2);
-#endif
-    ASSERT(!m_lastChunkBeforeScript);
     ASSERT(!isWaitingForScripts());
     ASSERT(!isStopped());
 
     // FIXME: Pass in current input length.
     TRACE_EVENT_BEGIN1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "ParseHTML", "beginData", InspectorParseHtmlEvent::beginData(document(), lineNumber().zeroBasedInt()));
     TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", TRACE_EVENT_SCOPE_PROCESS, "stack", InspectorCallStackEvent::currentCallStack());
 
     double startTime = currentTime();
 
     while (!m_speculations.isEmpty()) {
         processParsedChunkFromBackgroundParser(m_speculations.takeFirst());
 
         // Always check isStopped first as m_document may be null.
-        if (isStopped() || isWaitingForScripts())
+        if (isStopped() || isWaitingForScripts() || !document()->haveImportsLoaded())
             break;
 
         if (currentTime() - startTime > parserTimeLimit && !m_speculations.isEmpty()) {
             m_parserScheduler->scheduleForResume();
             break;
         }
     }
 
     TRACE_EVENT_END1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "ParseHTML", "endLine", lineNumber().zeroBasedInt());
     TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "UpdateCounters", TRACE_EVENT_SCOPE_PROCESS, "data", InspectorUpdateCountersEvent::data());
@@ skipping 37 matching lines @@
 {
     AtomicHTMLToken token(compactToken);
     m_treeBuilder->constructTree(&token);
 }
 
 bool HTMLDocumentParser::hasInsertionPoint()
 {
     return false;
 }
 
-void HTMLDocumentParser::startBackgroundParser()
-{
-}
-
 void HTMLDocumentParser::stopBackgroundParser()
 {
     ASSERT(m_haveBackgroundParser);
     m_haveBackgroundParser = false;
 
     HTMLParserThread::taskRunner()->PostTask(FROM_HERE,
         base::Bind(&BackgroundHTMLParser::stop, m_backgroundParser));
     m_weakFactory.InvalidateWeakPtrs();
 }
 
@@ skipping 52 matching lines @@
 {
     ASSERT(m_haveBackgroundParser);
     return m_textPosition;
 }
 
 bool HTMLDocumentParser::isWaitingForScripts() const
 {
     return m_treeBuilder->hasParserBlockingScript() || m_scriptRunner.hasPendingScripts();
 }
 
-void HTMLDocumentParser::resumeParsingAfterScriptExecution()
+void HTMLDocumentParser::resumeAfterWaitingForImports()
 {
+    RefPtr<HTMLDocumentParser> protect(this);
+    if (m_scriptRunner.hasPendingScripts())
+        m_scriptRunner.executePendingScripts();
     ASSERT(!isExecutingScript());
     ASSERT(!isWaitingForScripts());
     ASSERT(m_haveBackgroundParser);
-
-    validateSpeculations(m_lastChunkBeforeScript.release());
-    ASSERT(!m_lastChunkBeforeScript);
-    // 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);
     pumpPendingSpeculations();
 }
 
-void HTMLDocumentParser::executeScriptsWaitingForResources()
-{
-    if (!m_scriptRunner.hasPendingScripts())
-        return;
-    RefPtr<HTMLDocumentParser> protect(this);
-    m_scriptRunner.executePendingScripts();
-    if (!isWaitingForScripts())
-        resumeParsingAfterScriptExecution();
 }
-
-}