Changeset 60814 in webkit

Timestamp:

Jun 7, 2010 7:25:44 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-06-07 Eric Seidel <​eric@webkit.org>

Reviewed by Adam Barth.

HTML5 Parser fails script-tests which use document.write
​https://bugs.webkit.org/show_bug.cgi?id=40276

We were leaving the TreeBuilder paused when executing the scripts
resulting in document.write() calls being ignored.

I don't see a good way to ASSERT this correct behavior, since
the HTML5ScriptRunner and the HTML5TreeBuilder do not know about
each other. We should never have document.write() called while
the HTML5TreeBuilder is paused, however both document.write and
the network call the same HTML5Tokenizer::write method. It's OK
to be paused when the network writes, but during document.write
(or any other script execution).

Tested by all of fast/url and numerous other tests.

• html/HTML5Tokenizer.cpp: (WebCore::HTML5Tokenizer::notifyFinished):
  • Unpause the treebuilder before executing scripts.

(WebCore::HTML5Tokenizer::executeScriptsWaitingForStylesheets):

• Unpause the treebuilder before executing scripts.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTML5Tokenizer.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-07  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        HTML5 Parser fails script-tests which use document.write
+        https://bugs.webkit.org/show_bug.cgi?id=40276
+
+        We were leaving the TreeBuilder paused when executing the scripts
+        resulting in document.write() calls being ignored.
+
+        I don't see a good way to ASSERT this correct behavior, since
+        the HTML5ScriptRunner and the HTML5TreeBuilder do not know about
+        each other.  We should never have document.write() called while
+        the HTML5TreeBuilder is paused, however both document.write and
+        the network call the same HTML5Tokenizer::write method.  It's OK
+        to be paused when the network writes, but during document.write
+        (or any other script execution).
+
+        Tested by all of fast/url and numerous other tests.
+
+        * html/HTML5Tokenizer.cpp:
+        (WebCore::HTML5Tokenizer::notifyFinished):
+         - Unpause the treebuilder before executing scripts.
+        (WebCore::HTML5Tokenizer::executeScriptsWaitingForStylesheets):
+         - Unpause the treebuilder before executing scripts.
+
 2010-06-07  Eric Seidel  <eric@webkit.org>
 

trunk/WebCore/html/HTML5Tokenizer.cpp

@@ -226 +226 @@
     ASSERT(!m_scriptRunner->inScriptExecution());
     ASSERT(m_treeBuilder->isPaused());
+    // Note: We only ever wait on one script at a time, so we always know this
+    // is the one we were waiting on and can un-pause the tree builder.
+    m_treeBuilder->setPaused(false);
     bool shouldContinueParsing = m_scriptRunner->executeScriptsWaitingForLoad(cachedResource);
     m_treeBuilder->setPaused(!shouldContinueParsing);
@@ -241 +244 @@
     ASSERT(!m_scriptRunner->inScriptExecution());
     ASSERT(m_treeBuilder->isPaused());
+    // Note: We only ever wait on one script at a time, so we always know this
+    // is the one we were waiting on and can un-pause the tree builder.
+    m_treeBuilder->setPaused(false);
     bool shouldContinueParsing = m_scriptRunner->executeScriptsWaitingForStylesheets();
     m_treeBuilder->setPaused(!shouldContinueParsing);