[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 4a1359cd6eb0854edb67c8d8729e5a935334df07
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri May 16 17:28:28 2003 +0000

            Reviewed by Ken.
    
    	- fixed 3256997 - reproducible world leak (of 1 JavaScript interpreter) using google images
    
    	This turned out to be a page cache bug, and nothing to do with
    	JavaScript. The part and view were also leaked.
    
            * kwq/KWQKHTMLPart.mm:
            (KWQKHTMLPart::openURLFromPageCache): Make sure to reset the view
    	before resetting the document, so that when we check if the
    	document is in the page cache to determine if we can delete the
    	old view, we'll be checking the old document instead of the new
    	one.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4388 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 9e1238e..d74187c 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,19 @@
+2003-05-16  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Ken.
+
+	- fixed 3256997 - reproducible world leak (of 1 JavaScript interpreter) using google images 
+
+	This turned out to be a page cache bug, and nothing to do with
+	JavaScript. The part and view were also leaked.
+	
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::openURLFromPageCache): Make sure to reset the view
+	before resetting the document, so that when we check if the
+	document is in the page cache to determine if we can delete the
+	old view, we'll be checking the old document instead of the new
+	one.
+
 2003-05-15  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Richard.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 9e1238e..d74187c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,19 @@
+2003-05-16  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Ken.
+
+	- fixed 3256997 - reproducible world leak (of 1 JavaScript interpreter) using google images 
+
+	This turned out to be a page cache bug, and nothing to do with
+	JavaScript. The part and view were also leaked.
+	
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::openURLFromPageCache): Make sure to reset the view
+	before resetting the document, so that when we check if the
+	document is in the page cache to determine if we can delete the
+	old view, we'll be checking the old document instead of the new
+	one.
+
 2003-05-15  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Richard.
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 2dfcec3..b74f04a 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -1011,11 +1011,14 @@ void KWQKHTMLPart::openURLFromPageCache(KWQPageState *state)
     d->m_bLoadEventEmitted = false;
     d->m_referrer = m_url.url();
     
+    // We have to change the view back before setting the document,
+    // so that we test whether the *previous* document is in the page
+    // cache when deciding whether to delete the previous view.
+    setView (doc->view(), true);
+    
     d->m_doc = doc;
     d->m_doc->ref();
 
-    setView (doc->view(), true);
-    
     updatePolicyBaseURL();
         
     restoreWindowProperties (windowProperties);

-- 
WebKit Debian packaging