[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit b0a0159d440743e86207db941fceaf8f8d1b4957
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 19 16:00:18 2009 +0000

    2009-10-19  Dmitry Titov  <dimich at chromium.org>
    
            Reviewed by Adam Barth.
    
            Crash in DOMWindow::clearTimeout etc when DOMWindow is not connected to a frame.
            https://bugs.webkit.org/show_bug.cgi?id=29832
    
            Need to make sure the script caches are reset when frame gets disconnected from still-alive DOMWindow.
            This will prevent JS from calling DOMWindow methods that can not be completed w/o the frame.
    
            I am not sure it's possible to test this since the only file that repros the problem need ~10 seconds to cause crash.
    
            * page/Frame.cpp:
            (WebCore::Frame::~Frame): Right after frame disconnects from DOMWindow, clear WindowShell.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49786 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 8de2098..5cfccde 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2009-10-19  Dmitry Titov  <dimich at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Crash in DOMWindow::clearTimeout etc when DOMWindow is not connected to a frame.
+        https://bugs.webkit.org/show_bug.cgi?id=29832
+
+        Need to make sure the script caches are reset when frame gets disconnected from still-alive DOMWindow.
+        This will prevent JS from calling DOMWindow methods that can not be completed w/o the frame.
+
+        I am not sure it's possible to test this since the only file that repros the problem need ~10 seconds to cause crash.
+
+        * page/Frame.cpp:
+        (WebCore::Frame::~Frame): Right after frame disconnects from DOMWindow, clear WindowShell.
+
 2009-10-19  Csaba Osztrogonác  <ossy at webkit.org>
 
         Unreviewed build warning fix.
diff --git a/WebCore/page/Frame.cpp b/WebCore/page/Frame.cpp
index d52a225..fab7e3f 100644
--- a/WebCore/page/Frame.cpp
+++ b/WebCore/page/Frame.cpp
@@ -198,6 +198,7 @@ Frame::~Frame()
 
     if (m_domWindow)
         m_domWindow->disconnectFrame();
+    script()->clearWindowShell();
 
     HashSet<DOMWindow*>::iterator end = m_liveFormerWindows.end();
     for (HashSet<DOMWindow*>::iterator it = m_liveFormerWindows.begin(); it != end; ++it)

-- 
WebKit Debian packaging