[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 62755caa9cfe12480d5598d7eac1f050a19bc8e3
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Nov 15 04:53:47 2003 +0000

    	Fix for 3473707, 100% height positioned divs are too tall.  The padding box wasn't being used like it was
    	supposed to be when calcing percentage heights.
    
            Reviewed by kocienda
    
            * khtml/rendering/render_box.cpp:
            (RenderBox::calcAbsoluteVertical):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5504 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index c1f9832..14174e2 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-11-14  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3473707, 100% height positioned divs are too tall.  The padding box wasn't being used like it was
+	supposed to be when calcing percentage heights.
+	
+        Reviewed by kocienda
+
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::calcAbsoluteVertical):
+
 === Safari-114 ===
 
 2003-11-14  Maciej Stachowiak  <mjs at apple.com>
diff --git a/WebCore/khtml/rendering/render_box.cpp b/WebCore/khtml/rendering/render_box.cpp
index 8d87f8b..7a01cd7 100644
--- a/WebCore/khtml/rendering/render_box.cpp
+++ b/WebCore/khtml/rendering/render_box.cpp
@@ -1246,17 +1246,16 @@ void RenderBox::calcAbsoluteVertical()
     RenderObject* cb = container();
     Length hl = cb->style()->height();
     if (hl.isFixed())
-        ch = hl.value + cb->paddingTop()
-             + cb->paddingBottom() + cb->borderTop() + cb->borderBottom();
+        ch = hl.value + cb->paddingTop() + cb->paddingBottom();
     else if (cb->isRoot())
         ch = cb->availableHeight();
     else
-        ch = cb->height();
+        ch = cb->height() - cb->borderTop() - cb->borderBottom();
 
     if(!style()->top().isVariable())
-        t = style()->top().width(ch) + cb->borderTop();
+        t = style()->top().width(ch);
     if(!style()->bottom().isVariable())
-        b = style()->bottom().width(ch) + cb->borderBottom();
+        b = style()->bottom().width(ch);
     if (isTable() && style()->height().isVariable())
         // Height is never unsolved for tables. "auto" means shrink to fit.  Use our
         // height instead.
@@ -1285,7 +1284,7 @@ void RenderBox::calcAbsoluteVertical()
         // used for 1) top=static-position
         //          2) top, bottom, height are all auto -> calc top -> 3.
         //          3) precalc for case 2 below
-        static_top = m_staticY; // Should already have been set through layout of the parent().
+        static_top = m_staticY - cb->borderTop(); // Should already have been set through layout of the parent().
         RenderObject* po = parent();
         for (; po && po != cb; po = po->parent())
             static_top += po->yPos();
@@ -1370,7 +1369,7 @@ void RenderBox::calcAbsoluteVertical()
     
     m_marginTop = mt;
     m_marginBottom = mb;
-    m_y = t + mt;
+    m_y = t + mt + cb->borderTop();
     
 //    printf("v: h=%d, t=%d, b=%d, mt=%d, mb=%d, m_y=%d\n",h,t,b,mt,mb,m_y);
 

-- 
WebKit Debian packaging