Changeset 79944 in webkit

Timestamp:

Feb 28, 2011 4:54:55 PM (13 years ago)

Author:

tonyg@chromium.org

Message:

2011-02-28 Tony Gentilcore <​tonyg@chromium.org>

Reviewed by Adam Barth.

Follow HTML5 spec for document.open() a little more closely
​https://bugs.webkit.org/show_bug.cgi?id=55392

• fast/parser/double-write-from-closed-iframe-expected.txt: Added.
• fast/parser/double-write-from-closed-iframe.html: Added. Prior to this patch, the second write of 'PASS' could fail indeterminately.
• fast/parser/script-tests/double-write-from-closed-iframe.js: Added.
• fast/regex/script-tests/cross-frame-callable.js: Necessary to close late writes.

2011-02-28 Tony Gentilcore <​tonyg@chromium.org>

Reviewed by Adam Barth.

Follow HTML5 spec for document.open() a little more closely
​https://bugs.webkit.org/show_bug.cgi?id=55392

See: 3.5.1.4 at ​http://www.whatwg.org/specs/web-apps/current-work/#dom-document-open.

The second return check matches the spec. The first return check (isExecutingScript())
was left in place because without it, fast/tokenizer/write-external-script-open.html
would fail. It also possible there is a spec bug because FF4 crashes on that test and
IE9 prints "FAILURE." The isLoadingMainResource() check was removed because the main
resource is always loading while parser->isParsing().

Test: fast/parser/double-write-from-closed-iframe.html

• dom/Document.cpp: (WebCore::Document::open):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/parser/double-write-from-closed-iframe-expected.txt (added)
• LayoutTests/fast/parser/double-write-from-closed-iframe.html (added)
• LayoutTests/fast/parser/script-tests/double-write-from-closed-iframe.js (added)
• LayoutTests/fast/regex/script-tests/cross-frame-callable.js (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Document.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-02-28  Tony Gentilcore  <tonyg@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Follow HTML5 spec for document.open() a little more closely
+        https://bugs.webkit.org/show_bug.cgi?id=55392
+
+        * fast/parser/double-write-from-closed-iframe-expected.txt: Added.
+        * fast/parser/double-write-from-closed-iframe.html: Added. Prior to this patch, the second write of 'PASS' could fail indeterminately.
+        * fast/parser/script-tests/double-write-from-closed-iframe.js: Added.
+        * fast/regex/script-tests/cross-frame-callable.js: Necessary to close late writes.
+
 2011-02-28  James Robinson  <jamesr@chromium.org>
 

trunk/LayoutTests/fast/regex/script-tests/cross-frame-callable.js

@@ -9 +9 @@
 document.body.appendChild(iframe);
 iframe.contentDocument.write('<script>top.doTest(/a/)</script>');
+iframe.contentDocument.close();
 document.write('DONE');
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-02-28  Tony Gentilcore  <tonyg@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Follow HTML5 spec for document.open() a little more closely
+        https://bugs.webkit.org/show_bug.cgi?id=55392
+
+        See: 3.5.1.4 at http://www.whatwg.org/specs/web-apps/current-work/#dom-document-open.
+
+        The second return check matches the spec. The first return check (isExecutingScript())
+        was left in place because without it, fast/tokenizer/write-external-script-open.html
+        would fail. It also possible there is a spec bug because FF4 crashes on that test and
+        IE9 prints "FAILURE." The isLoadingMainResource() check was removed because the main
+        resource is always loading while parser->isParsing().
+
+        Test: fast/parser/double-write-from-closed-iframe.html
+
+        * dom/Document.cpp:
+        (WebCore::Document::open):
+
 2011-02-28  Avi Drissman  <avi@google.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -1893 +1893 @@
 
     if (m_frame) {
-        ScriptableDocumentParser* parser = scriptableDocumentParser();
-        if (m_frame->loader()->isLoadingMainResource() || (parser && parser->isParsing() && parser->isExecutingScript()))
-            return;
+        if (ScriptableDocumentParser* parser = scriptableDocumentParser()) {
+            if (parser->isParsing()) {
+                // FIXME: HTML5 doesn't tell us to check this, it might not be correct.
+                if (parser->isExecutingScript())
+                    return;
+
+                if (!parser->wasCreatedByScript() && parser->hasInsertionPoint())
+                    return;
+            }
+        }
 
         if (m_frame->loader()->state() == FrameStateProvisional)