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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit a0aaffc9a5e64a57d19088db1ce6ef25e7c573ba
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Mar 13 00:10:09 2003 +0000

            Fixed leak of RenderRoot.
    
            Reviewed by darin.
    
            * kwq/KWQPageState.mm:
            (-[KWQPageState invalidate]):  Added comment.
            (-[KWQPageState dealloc]):  Ensure that the renderer is "re"set on
            the document so it will be correctly cleaned up in detach.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3811 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 22dfd27..b785f13 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2003-03-12  Richard Williamson   <rjw at apple.com>
+
+        Fixed leak of RenderRoot.
+        
+        Reviewed by darin.
+
+        * kwq/KWQPageState.mm:
+        (-[KWQPageState invalidate]):  Added comment.
+        (-[KWQPageState dealloc]):  Ensure that the renderer is "re"set on
+        the document so it will be correctly cleaned up in detach.
+
 2003-03-12  David Hyatt  <hyatt at apple.com>
 
 	Two fixes.  The first is more help with macromedia.  Floats could
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 22dfd27..b785f13 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2003-03-12  Richard Williamson   <rjw at apple.com>
+
+        Fixed leak of RenderRoot.
+        
+        Reviewed by darin.
+
+        * kwq/KWQPageState.mm:
+        (-[KWQPageState invalidate]):  Added comment.
+        (-[KWQPageState dealloc]):  Ensure that the renderer is "re"set on
+        the document so it will be correctly cleaned up in detach.
+
 2003-03-12  David Hyatt  <hyatt at apple.com>
 
 	Two fixes.  The first is more help with macromedia.  Floats could
diff --git a/WebCore/kwq/KWQPageState.mm b/WebCore/kwq/KWQPageState.mm
index 947d90b..79c4bd8 100644
--- a/WebCore/kwq/KWQPageState.mm
+++ b/WebCore/kwq/KWQPageState.mm
@@ -78,7 +78,7 @@ using KJS::SavedProperties;
     QObject::clearPausedTimers(self);
 }
 
-// Called when the KWQPageState is restored.  It should relinquish ownership
+// Called when the KWQPageState is restored.  It relinquishs ownership
 // of objects to core.
 - (void)invalidate
 {
@@ -86,6 +86,13 @@ using KJS::SavedProperties;
     ASSERT(document);
     
     document->setInPageCache(NO);
+    
+    // Do NOT detach the renderer here.  The ownership of the renderer
+    // has been handed off to core.  The renderer is being used in an
+    // active page.  It will be either cleaned up with the document or
+    // re-added to another page cache.
+    docRenderer = 0;
+    
     document->deref();
     document = 0;
 
@@ -108,6 +115,7 @@ using KJS::SavedProperties;
         KWQKHTMLPart::clearTimers(view);
 
         document->setInPageCache(NO);
+        document->restoreRenderer(docRenderer);
         document->detach();
         document->deref();
         

-- 
WebKit Debian packaging