2008-08-06 Beth Dakin <bdakin@apple.com>

        Reviewed by Adele.

        Fix for <rdar://problem/6130724>

        Disconnected frames should not be allowed to resize the window.

        * page/DOMWindow.cpp:
        (WebCore::DOMWindow::resizeBy):
        (WebCore::DOMWindow::resizeTo):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@35613 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4d341c15a96464261782058fcb4c9bf9acadd0b4..e5e33e33e2a68091b3537064d8927a15bd17c793 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2008-08-06  Beth Dakin  <bdakin@apple.com>
+
+        Reviewed by Adele.
+
+        Fix for <rdar://problem/6130724>
+
+        Disconnected frames should not be allowed to resize the window.
+
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::resizeBy):
+        (WebCore::DOMWindow::resizeTo):
+
 2008-08-05  David D. Kilzer  <ddkilzer@apple.com>
 
         Bug 20038: REGRESSION (r35151): Can't post comments on flickr.com

diff --git a/WebCore/page/DOMWindow.cpp b/WebCore/page/DOMWindow.cpp
index 23ebe6154851d0edb436c43af29c79f9f36deadb..0cad336f411970169c1a3b1728e6593e3ef1240a 100644 (file)
--- a/WebCore/page/DOMWindow.cpp
+++ b/WebCore/page/DOMWindow.cpp
@@ -874,6 +874,9 @@ void DOMWindow::resizeBy(float x, float y) const
     if (!m_frame)
         return;
 
+    if (m_frame->isDisconnected())
+        return;
+
     Page* page = m_frame->page();
     if (!page)
         return;
@@ -890,6 +893,9 @@ void DOMWindow::resizeTo(float width, float height) const
     if (!m_frame)
         return;
 
+    if (m_frame->isDisconnected())
+        return;
+
     Page* page = m_frame->page();
     if (!page)
         return;