Changeset 16081 in webkit

Timestamp:

Aug 28, 2006 1:43:36 PM (18 years ago)

Author:

aliceli1

Message:

LayoutTests:

Reviewed by Geoff.

Added tests for <rdar://problem/4548537> Document.domain and other attributes are blank for an iframe created with document.write

• http/tests/misc/iframe-domain-test-expected.txt: Added.
• http/tests/misc/iframe-domain-test.html: Added.

WebCore:

Reviewed by Geoff.

Fixed <rdar://problem/4548537> Document.domain and other attributes are blank for an iframe created with document.write

• dom/Document.cpp: (WebCore::Document::open): set the document's url to the parent's url and re-located the code that does this to occur before calling the frame's didExplicitOpen()
• page/Frame.cpp: (WebCore::Frame::didExplicitOpen): set the frame's url to the document's url

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/misc/iframe-domain-test-expected.txt (added)
• LayoutTests/http/tests/misc/iframe-domain-test.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/Document.cpp (modified) (2 diffs)
• WebCore/page/Frame.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2006-08-28  Alice Liu  <alice.liu@apple.com>
+
+        Reviewed by Geoff.
+
+       Added tests for <rdar://problem/4548537> Document.domain and other attributes are blank for an iframe created with document.write
+
+        * http/tests/misc/iframe-domain-test-expected.txt: Added.
+        * http/tests/misc/iframe-domain-test.html: Added.
+
 2006-08-27  Rob Buis  <buis@kde.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-08-28  Alice Liu  <alice.liu@apple.com>
+
+        Reviewed by Geoff.
+
+        Fixed <rdar://problem/4548537> Document.domain and other attributes are blank for an iframe created with document.write
+
+        * dom/Document.cpp:
+        (WebCore::Document::open):
+        set the document's url to the parent's url and re-located the code that does this to occur before calling the frame's didExplicitOpen()
+        * page/Frame.cpp:
+        (WebCore::Frame::didExplicitOpen):
+        set the frame's url to the document's url
+
 2006-08-28  Brady Eidson  <beidson@apple.com>
 

trunk/WebCore/dom/Document.cpp

@@ -1109 +1109 @@
 void Document::open()
 {
+    // This is work that we should probably do in clear(), but we can't have it
+    // happen when implicitOpen() is called unless we reorganize Frame code.
+    if (Document *parent = parentDocument()) {
+        setURL(parent->baseURL());
+        setBaseURL(parent->baseURL());
+    }
+    else
+        setURL(DeprecatedString());
+        
+
     if ((frame() && frame()->isLoadingMainResource()) || (tokenizer() && tokenizer()->executingScript()))
         return;
@@ -1116 +1126 @@
     if (frame())
         frame()->didExplicitOpen();
-
-    // This is work that we should probably do in clear(), but we can't have it
-    // happen when implicitOpen() is called unless we reorganize Frame code.
-    setURL(DeprecatedString());
-    if (Document *parent = parentDocument())
-        setBaseURL(parent->baseURL());
 }
 

trunk/WebCore/page/Frame.cpp

@@ -272 +272 @@
   // implicitly precedes document.write.
   cancelRedirection(); 
+  d->m_url = d->m_doc->URL();
 }