Fixed <rdar://problem/4031483> Leak (RenderObject::createInlineBox) reproducible...

	We were leaking inline block line boxes.  Argh!

        Reviewed by Hyatt.

        * khtml/rendering/render_flow.cpp:
        (RenderFlow::dirtyLineBoxes):
        * khtml/rendering/render_line.cpp:
        (khtml::InlineBox::deleteLine):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@8758 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index c00049bc4572d9d3279af09f12157bad02fbb971..2e3b2ac89b35dee536b4af70ca66c9439997a5bb 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,16 @@
+2005-03-02  Richard Williamson   <rjw@apple.com>
+
+       Fixed <rdar://problem/4031483> Leak (RenderObject::createInlineBox) reproducible with Stock widget
+
+       We were leaking inline block line boxes.  Argh!
+
+        Reviewed by Hyatt.
+
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::dirtyLineBoxes):
+        * khtml/rendering/render_line.cpp:
+        (khtml::InlineBox::deleteLine):
+
 2005-03-02  Chris Blumenberg  <cblu@apple.com>
 
        Fixed: <rdar://problem/3976872> REGRESSION (Mail): Pasted plain text doesn't get the proper style if pasted into newlines

diff --git a/WebCore/khtml/rendering/render_flow.cpp b/WebCore/khtml/rendering/render_flow.cpp
index bdff777623670f936cdf1ea077e43f33d90f5cc1..4f0c183b1bbb4e860940bc390fdfb8c869de690d 100644 (file)
--- a/WebCore/khtml/rendering/render_flow.cpp
+++ b/WebCore/khtml/rendering/render_flow.cpp
@@ -308,7 +308,7 @@ short RenderFlow::lineHeight(bool firstLine, bool isRootLineBox) const
 void RenderFlow::dirtyLineBoxes(bool fullLayout, bool isRootLineBox)
 {
     if (!isRootLineBox && isReplaced())
-        return RenderContainer::dirtyLineBoxes(isRootLineBox);
+        return RenderContainer::dirtyLineBoxes(fullLayout, isRootLineBox);
     
     if (fullLayout)
         deleteLineBoxes();

diff --git a/WebCore/khtml/rendering/render_line.cpp b/WebCore/khtml/rendering/render_line.cpp
index 5415900f6409c0525101d93bde983175106a1798..492afee4e5011b28ce69ac2922554f6e049039d2 100644 (file)
--- a/WebCore/khtml/rendering/render_line.cpp
+++ b/WebCore/khtml/rendering/render_line.cpp
@@ -129,6 +129,7 @@ void InlineBox::dirtyLineBoxes()
 
 void InlineBox::deleteLine(RenderArena* arena)
 {
+    m_object->setInlineBoxWrapper(0);
     detach(arena);
 }