[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 760b2e8f25c0c28ea41112e892ca2a7163dcfb89
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 17 08:47:23 2003 +0000

            Reviewed by Dave.
    
    	- fixed 3148141 - crash in KJS::WindowFunc::tryCall leaving certain site
    
            * kwq/KWQKHTMLPart.mm:
            (KWQKHTMLPart::setView): If setting the view to nil and we have a
    	document, detach the document. This means that we are removing a
    	frame from the tree, so we want to run it's onUnload handler now,
    	rather than later when things are no longer fully hooked up.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3345 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index cf55fd8..60987e5 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2003-01-16  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Dave.
+
+	- fixed 3148141 - crash in KJS::WindowFunc::tryCall leaving certain site
+	
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::setView): If setting the view to nil and we have a
+	document, detach the document. This means that we are removing a
+	frame from the tree, so we want to run it's onUnload handler now,
+	rather than later when things are no longer fully hooked up.
+
 2003-01-16  Richard Williamson   <rjw at apple.com>
 
         Fixed 3148932.  Account for zero width characters
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index cf55fd8..60987e5 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2003-01-16  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Dave.
+
+	- fixed 3148141 - crash in KJS::WindowFunc::tryCall leaving certain site
+	
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::setView): If setting the view to nil and we have a
+	document, detach the document. This means that we are removing a
+	frame from the tree, so we want to run it's onUnload handler now,
+	rather than later when things are no longer fully hooked up.
+
 2003-01-16  Richard Williamson   <rjw at apple.com>
 
         Fixed 3148932.  Account for zero width characters
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 592450a..690e209 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -279,6 +279,13 @@ ReadOnlyPart *KWQKHTMLPart::createPart(const ChildFrame &child, const KURL &url,
     
 void KWQKHTMLPart::setView(KHTMLView *view, bool weOwnIt)
 {
+    // Detach the document now, so any onUnload handlers get run - if
+    // we wait until the view is destroyed, then things won't be
+    // hooked up enough for some JavaScript calls to work.
+    if (d->m_doc && view == NULL) {
+	d->m_doc->detach();
+    }
+
     if (_ownsView) {
         if (!(d->m_doc && d->m_doc->inPageCache()))
             delete d->m_view;

-- 
WebKit Debian packaging