Reviewed by Geoff.

        - fixed <rdar://problem/4634484> REGRESSION: Project Change Request form should have vertical scroll bar, but doesn't

        I couldn't figure out how to make an automated test case for this,
        or even a manual one. It seems to be timing-related in some way.

        * html/HTMLFrameElement.cpp:
        (WebCore::HTMLFrameElement::close): detach the child frame from
        its element, not the frame containing this element.

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index db83ea968d25a00c93d65d7601135e1007eedcfd..ea6dddbcb99859d9fdb73f7862defabb19d01072 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2006-07-19  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Geoff.
+
+        - fixed <rdar://problem/4634484> REGRESSION: Project Change Request form should have vertical scroll bar, but doesn't
+        
+        I couldn't figure out how to make an automated test case for this,
+        or even a manual one. It seems to be timing-related in some way.
+
+        * html/HTMLFrameElement.cpp:
+        (WebCore::HTMLFrameElement::close): detach the child frame from
+        its element, not the frame containing this element.
+
 2006-07-20  Anders Carlsson  <acarlsson@apple.com>
 
         Reviewed by Darin.

diff --git a/WebCore/html/HTMLFrameElement.cpp b/WebCore/html/HTMLFrameElement.cpp
index bf0958ecde5130b6aba3c7d85c53e430591fce9c..38c48f9e45f0eb80efa1afa81169632d60180b85 100644 (file)
--- a/WebCore/html/HTMLFrameElement.cpp
+++ b/WebCore/html/HTMLFrameElement.cpp
@@ -228,9 +228,11 @@ void HTMLFrameElement::close()
 {
     Frame* frame = document()->frame();
     if (renderer() && frame) {
-        frame->disconnectOwnerElement();
-        if (Frame* childFrame = frame->tree()->child(m_name))
+        //frame->disconnectOwnerElement();
+        if (Frame* childFrame = frame->tree()->child(m_name)) {
             childFrame->frameDetached();
+            childFrame->disconnectOwnerElement();
+        }
     }
 }