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

darin darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:23:27 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 59f661f870087e7ec702a08d34823901a208e87e
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 4 00:32:21 2003 +0000

            Reviewed by Dave.
    
    	- fixed 3133902 -- leaked render objects from makeChildrenNonInline (4 after running cvs-base)
    
            * khtml/rendering/render_block.cpp: (RenderBlock::removeChild):
            Deatch the anonymous block after emptying it out.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3552 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 3324214..9bcfe9d 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2003-02-03  Darin Adler  <darin at apple.com>
+
+        Reviewed by Dave.
+
+	- fixed 3133902 -- leaked render objects from makeChildrenNonInline (4 after running cvs-base)
+
+        * khtml/rendering/render_block.cpp: (RenderBlock::removeChild):
+        Deatch the anonymous block after emptying it out.
+
 2003-02-03  David Hyatt  <hyatt at apple.com>
 
 	Fix for livepage.apple.com crash.  The bug # is
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 3324214..9bcfe9d 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2003-02-03  Darin Adler  <darin at apple.com>
+
+        Reviewed by Dave.
+
+	- fixed 3133902 -- leaked render objects from makeChildrenNonInline (4 after running cvs-base)
+
+        * khtml/rendering/render_block.cpp: (RenderBlock::removeChild):
+        Deatch the anonymous block after emptying it out.
+
 2003-02-03  David Hyatt  <hyatt at apple.com>
 
 	Fix for livepage.apple.com crash.  The bug # is
diff --git a/WebCore/khtml/rendering/render_block.cpp b/WebCore/khtml/rendering/render_block.cpp
index 03528b0..80027bb 100644
--- a/WebCore/khtml/rendering/render_block.cpp
+++ b/WebCore/khtml/rendering/render_block.cpp
@@ -375,6 +375,9 @@ void RenderBlock::removeChild(RenderObject *oldChild)
         }
         setLayouted(false);
         setMinMaxKnown(false);
+
+        // Nuke the now-empty block.
+        anonBlock->detach(renderArena());
     }
 }
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list