[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 07:39:20 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 431aaad7f9efe029044619a8f7d7b92bb2b17a36
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Apr 29 23:46:03 2003 +0000
Tweaking a comment.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4213 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/khtml/rendering/render_object.cpp b/WebCore/khtml/rendering/render_object.cpp
index 1b406f3..2911c9f 100644
--- a/WebCore/khtml/rendering/render_object.cpp
+++ b/WebCore/khtml/rendering/render_object.cpp
@@ -1480,7 +1480,8 @@ void RenderObject::recalcMinMaxWidths()
}
// we need to recalculate, if the contains inline children, as the change could have
- // happened somewhere deep inside the child tree
+ // happened somewhere deep inside the child tree. Also do this for blocks or tables that
+ // are inline (i.e., inline-block and inline-table).
if ((!isInline() || isInlineBlockOrInlineTable()) && childrenInline())
m_minMaxKnown = false;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list