Changeset 61602 in webkit

Timestamp:

Jun 21, 2010 11:25:29 PM (14 years ago)

Author:

abarth@webkit.org

Message:

2010-06-21 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

document.write from BeforeLoad should not assert
​https://bugs.webkit.org/show_bug.cgi?id=40971

Test what happens when we document.write from a beforeload event.
Notice that the order is wrong. I'll fix that in a followup patch.

• fast/tokenizer/write-before-load-expected.txt: Added.
• fast/tokenizer/write-before-load.html: Added.

2010-06-21 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

document.write from BeforeLoad should not assert
​https://bugs.webkit.org/show_bug.cgi?id=40971

We're setting the parse blocking script too early. It's not actually
blocking parsing yet.

Test: fast/tokenizer/write-before-load.html

• html/HTML5ScriptRunner.cpp: (WebCore::HTML5ScriptRunner::requestScript):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/tokenizer/write-before-load-expected.txt (added)
• LayoutTests/fast/tokenizer/write-before-load.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/HTML5ScriptRunner.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-06-21  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        document.write from BeforeLoad should not assert
+        https://bugs.webkit.org/show_bug.cgi?id=40971
+
+        Test what happens when we document.write from a beforeload event.
+        Notice that the order is wrong.  I'll fix that in a followup patch.
+
+        * fast/tokenizer/write-before-load-expected.txt: Added.
+        * fast/tokenizer/write-before-load.html: Added.
+
 2010-06-21  Dmitry Titov  <dimich@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-21  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        document.write from BeforeLoad should not assert
+        https://bugs.webkit.org/show_bug.cgi?id=40971
+
+        We're setting the parse blocking script too early.  It's not actually
+        blocking parsing yet.
+
+        Test: fast/tokenizer/write-before-load.html
+
+        * html/HTML5ScriptRunner.cpp:
+        (WebCore::HTML5ScriptRunner::requestScript):
+
 2010-06-21  Chris Fleizach  <cfleizach@apple.com>
 

trunk/WebCore/html/HTML5ScriptRunner.cpp

@@ -235 +235 @@
 
     // FIXME: We need to resolve the url relative to the element.
+    if (!script->dispatchBeforeLoadEvent(srcValue)) // Part of HTML5?
+        return;
     m_parsingBlockingScript.element = script;
-    if (!script->dispatchBeforeLoadEvent(srcValue)) // Part of HTML5?
-        return;
     // This should correctly return 0 for empty or invalid srcValues.
     CachedScript* cachedScript = m_document->docLoader()->requestScript(srcValue, toScriptElement(script)->scriptCharset());