[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
hyatt
hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:26:29 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit f66c0207f78ca3a5f863741ea5f3a128e376b06b
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Feb 12 01:50:03 2004 +0000
Fix for 3550005, 936 leaks when loading checkbox page of pain. Make sure to nuke the inline box
wrapper when detaching the RenderWidget.
* khtml/rendering/render_replaced.cpp:
(RenderWidget::detach):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6079 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a87efeb..907b85b 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,13 @@
2004-02-11 David Hyatt <hyatt at apple.com>
+ Fix for 3550005, 936 leaks when loading checkbox page of pain. Make sure to nuke the inline box
+ wrapper when detaching the RenderWidget.
+
+ * khtml/rendering/render_replaced.cpp:
+ (RenderWidget::detach):
+
+2004-02-11 David Hyatt <hyatt at apple.com>
+
Add some more polish to ensure the ypos estimate is right. Correct the clearing of images so that
their top margins do not get added in when they clear the float because of having a large width.
diff --git a/WebCore/khtml/rendering/render_replaced.cpp b/WebCore/khtml/rendering/render_replaced.cpp
index d1fd564..9546550 100644
--- a/WebCore/khtml/rendering/render_replaced.cpp
+++ b/WebCore/khtml/rendering/render_replaced.cpp
@@ -151,6 +151,11 @@ void RenderWidget::detach()
}
RenderArena* arena = renderArena();
+ if (m_inlineBoxWrapper) {
+ if (!documentBeingDestroyed())
+ m_inlineBoxWrapper->remove();
+ m_inlineBoxWrapper->detach(arena);
+ }
setNode(0);
deref(arena);
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list