Changeset 40371 in webkit

Timestamp:

Jan 29, 2009, 1:37:18 PM (16 years ago)

Author:

beidson@apple.com

Message:

WebCore:

2009-01-29 Brady Eidson <​beidson@apple.com>

Reviewed by Oliver Hunt

<rdar://problem/6337157> hyundaiusa.com closes window or tab during load

Test: fast/loader/subframe-self-close.html

• page/DOMWindow.cpp: (WebCore::DOMWindow::close): Only allow mainframes to close the window.

LayoutTests:

2009-01-29 Brady Eidson <​beidson@apple.com>

Reviewed by Oliver Hunt

<rdar://problem/6337157> hyundaiusa.com closes window or tab during load

• fast/loader/resources/subframe-self-close.html: Added.
• fast/loader/subframe-self-close-expected.txt: Added.
• fast/loader/subframe-self-close.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/loader/resources/subframe-self-close.html (added)
• LayoutTests/fast/loader/subframe-self-close-expected.txt (added)
• LayoutTests/fast/loader/subframe-self-close.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/DOMWindow.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-01-29  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Oliver Hunt
+
+        <rdar://problem/6337157> hyundaiusa.com closes window or tab during load
+
+        * fast/loader/resources/subframe-self-close.html: Added.
+        * fast/loader/subframe-self-close-expected.txt: Added.
+        * fast/loader/subframe-self-close.html: Added.
+
 2009-01-29  Alexey Proskuryakov  <ap@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-01-29  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Oliver Hunt
+
+        <rdar://problem/6337157> hyundaiusa.com closes window or tab during load
+
+        Test: fast/loader/subframe-self-close.html
+
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::close): Only allow mainframes to close the window.
+
 2009-01-29  Nikolas Zimmermann  <nikolas.zimmermann@torchmobile.com>
 

trunk/WebCore/page/DOMWindow.cpp

@@ -450 +450 @@
         return;
 
+    Page* page = m_frame->page();
+    if (!page)
+        return;
+
+    if (m_frame != page->mainFrame())
+        return;
+
     Settings* settings = m_frame->settings();
     bool allowScriptsToCloseWindows =