[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 76b816031fd96e2290c7493cbe2cff8726ac1ed8
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 13 02:15:23 2002 +0000

    	Fix the top of moveabletype.org.  The maxwidth/minwidth
    	calculation for blocks with inline content did not properly
    	deal with margins and padding on inline elements like <a>.
    
            * khtml/rendering/render_flow.cpp:
            (RenderFlow::calcInlineMinMaxWidth):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2648 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index ad43ac5..77d943b 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,14 @@
 2002-11-12  David Hyatt  <hyatt at apple.com>
 
+	Fix the top of moveabletype.org.  The maxwidth/minwidth
+	calculation for blocks with inline content did not properly
+	deal with margins and padding on inline elements like <a>.
+	
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::calcInlineMinMaxWidth):
+
+2002-11-12  David Hyatt  <hyatt at apple.com>
+
 	Fix for 2953367, padding is incorrectly inherited into table cells
 	and also incorrectly overrides cellpadding on the table itself.
 	Fixes dailyf1.com.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index ad43ac5..77d943b 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,14 @@
 2002-11-12  David Hyatt  <hyatt at apple.com>
 
+	Fix the top of moveabletype.org.  The maxwidth/minwidth
+	calculation for blocks with inline content did not properly
+	deal with margins and padding on inline elements like <a>.
+	
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::calcInlineMinMaxWidth):
+
+2002-11-12  David Hyatt  <hyatt at apple.com>
+
 	Fix for 2953367, padding is incorrectly inherited into table cells
 	and also incorrectly overrides cellpadding on the table itself.
 	Fixes dailyf1.com.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index ad43ac5..77d943b 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,14 @@
 2002-11-12  David Hyatt  <hyatt at apple.com>
 
+	Fix the top of moveabletype.org.  The maxwidth/minwidth
+	calculation for blocks with inline content did not properly
+	deal with margins and padding on inline elements like <a>.
+	
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::calcInlineMinMaxWidth):
+
+2002-11-12  David Hyatt  <hyatt at apple.com>
+
 	Fix for 2953367, padding is incorrectly inherited into table cells
 	and also incorrectly overrides cellpadding on the table itself.
 	Fixes dailyf1.com.
diff --git a/WebCore/khtml/rendering/render_flow.cpp b/WebCore/khtml/rendering/render_flow.cpp
index 6381d39..4e26865 100644
--- a/WebCore/khtml/rendering/render_flow.cpp
+++ b/WebCore/khtml/rendering/render_flow.cpp
@@ -1337,6 +1337,23 @@ void RenderFlow::calcInlineMinMaxWidth()
                     margins += (type == Fixed ? cstyle->marginRight().value : child->marginRight());
                 childMin += margins;
                 childMax += margins;
+                
+                if (child->isInline() && child->isFlow()) {
+                    // Add in padding for inline flow elements.  This is wrong in the
+                    // same way the margin addition is wrong. XXXdwh fixme.
+                    int padding = 0;
+                    type = cstyle->paddingLeft().type;
+                    if ( type != Variable )
+                        padding += (type == Fixed ? cstyle->paddingLeft().value : child->paddingLeft());
+                    type = cstyle->paddingRight().type;
+                    if ( type != Variable )
+                        padding += (type == Fixed ? cstyle->paddingRight().value : child->paddingRight());
+                    childMin += padding;
+                    childMax += padding;
+                    
+                    inlineMin += childMin;
+                    inlineMax += childMax;
+                }
             }
             
             if (!(child->isInline() && child->isFlow()) && !child->isText()) {

-- 
WebKit Debian packaging