Attachment 59344 Details for Bug 40971 – Patch

[patch] Patch

bug-40971-20100621232252.patch (text/plain), 3.40 KB, created by Adam Barth on 2010-06-21 23:22:53 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Barth

Created: 2010-06-21 23:22:53 PDT

Size: 3.40 KB

patch

obsolete

>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index ae305cd5f979203aa4f24fc67ddcd205f91edaf3..361db894439141da5f701d589b85ad614a0381f5 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,16 @@
>+2010-06-21  Adam Barth  <abarth@webkit.org>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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>
> 
>         Unreviewed, fixing qt-specific expected results for r61599
>diff --git a/LayoutTests/fast/tokenizer/write-before-load-expected.txt b/LayoutTests/fast/tokenizer/write-before-load-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..1da9c6c2a87277555bc1c8b4b20b9acc428f601b
>--- /dev/null
>+++ b/LayoutTests/fast/tokenizer/write-before-load-expected.txt
>@@ -0,0 +1 @@
>+1 2 7 3456
>diff --git a/LayoutTests/fast/tokenizer/write-before-load.html b/LayoutTests/fast/tokenizer/write-before-load.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..20fe85b3bd225b996f262a33b07c7196a746187b
>--- /dev/null
>+++ b/LayoutTests/fast/tokenizer/write-before-load.html
>@@ -0,0 +1,17 @@
>+1
>+<script>
>+if (window.layoutTestController)
>+    layoutTestController.dumpAsText();
>+
>+function doubleWrite(number)
>+{
>+    document.write("<script>document.write(" + number + ")</scr" +
>+                   "ipt><script>document.write(" + (number + 1) + ")</scr" + "ipt>")
>+}
>+</script>
>+2
>+<script
>+    onbeforeload="doubleWrite(3)"
>+    src="data:text/javascript,doubleWrite(5)">
>+</script>
>+7
>diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
>index 6cec4c2b2891b2649ab6e8ad4bcad7e0e315cdb5..5db21c20364882bf34bd31a4de437693d01af28a 100644
>--- a/WebCore/ChangeLog
>+++ b/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2010-06-21  Adam Barth  <abarth@webkit.org>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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>
> 
>         No review. QT build fix again.
>diff --git a/WebCore/html/HTML5ScriptRunner.cpp b/WebCore/html/HTML5ScriptRunner.cpp
>index 40f4465440e0e8697dcc72830050d1f65ed86668..88ef359da72817d1e9f2b8c3e3e41969eaec4eed 100644
>--- a/WebCore/html/HTML5ScriptRunner.cpp
>+++ b/WebCore/html/HTML5ScriptRunner.cpp
>@@ -234,9 +234,9 @@ void HTML5ScriptRunner::requestScript(Element* script)
>         return;
> 
>     // FIXME: We need to resolve the url relative to the element.
>-    m_parsingBlockingScript.element = script;
>     if (!script->dispatchBeforeLoadEvent(srcValue)) // Part of HTML5?
>         return;
>+    m_parsingBlockingScript.element = script;
>     // This should correctly return 0 for empty or invalid srcValues.
>     CachedScript* cachedScript = m_document->docLoader()->requestScript(srcValue, toScriptElement(script)->scriptCharset());
>     if (!cachedScript) {

Flags:

eric: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 40971: 59344