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

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit d19ba8a68bcd520490c5972e26078f8265b6de92
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Apr 23 23:57:49 2004 +0000

    	Fix the apple-line-clamp values to more closely match what is needed, an even split of the max lines between the possible
    	values.
    
            * khtml/rendering/render_flexbox.cpp:
            (khtml::RenderFlexibleBox::layoutVerticalBox):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6474 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index c3859c7..1b907e9 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,13 @@
 2004-04-23  David Hyatt  <hyatt at apple.com>
 
+	Fix the apple-line-clamp values to more closely match what is needed, an even split of the max lines between the possible
+	values.
+
+        * khtml/rendering/render_flexbox.cpp:
+        (khtml::RenderFlexibleBox::layoutVerticalBox):
+
+2004-04-23  David Hyatt  <hyatt at apple.com>
+
 	Fix to make the containing block percentage height calculation actually work according to the CSS2 spec.
 	Percentages other than 100% are now supported, and flexing percentage height blocks inside table cells
 	are now supported.
diff --git a/WebCore/khtml/rendering/render_flexbox.cpp b/WebCore/khtml/rendering/render_flexbox.cpp
index fe3ed35..ea36c97 100644
--- a/WebCore/khtml/rendering/render_flexbox.cpp
+++ b/WebCore/khtml/rendering/render_flexbox.cpp
@@ -695,7 +695,7 @@ void RenderFlexibleBox::layoutVerticalBox(bool relayoutChildren)
         
         // Get the # of lines and then alter all block flow children with auto height to use the
         // specified height.
-        int numLines = kMax(1, int(maxLineCount*style()->lineClamp()/100.0));
+        int numLines = int(maxLineCount*style()->lineClamp()/100.0 + 1.0);
         if (numLines < maxLineCount) {
             child = iterator.first();
             while (child) {

-- 
WebKit Debian packaging