[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 57919a6517c2d0ff900a767911d44dee90670218
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 22 22:34:06 2003 +0000

    	Fix absolute positioning problem for bottom-positioned elements.
    	This is a fix from the KHTML trunk.
    
            Reviewed by john
    
            * khtml/rendering/render_box.cpp:
            (RenderBox::calcAbsoluteVertical):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3407 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index f78cfde..094f8c6 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2003-01-22  David Hyatt  <hyatt at apple.com>
+
+	Fix absolute positioning problem for bottom-positioned elements.  
+	This is a fix from the KHTML trunk.
+	
+        Reviewed by john
+
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::calcAbsoluteVertical):
+
 2003-01-22  Darin Adler  <darin at apple.com>
 
         Reviewed by Maciej.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index f78cfde..094f8c6 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-01-22  David Hyatt  <hyatt at apple.com>
+
+	Fix absolute positioning problem for bottom-positioned elements.  
+	This is a fix from the KHTML trunk.
+	
+        Reviewed by john
+
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::calcAbsoluteVertical):
+
 2003-01-22  Darin Adler  <darin at apple.com>
 
         Reviewed by Maciej.
diff --git a/WebCore/khtml/rendering/render_box.cpp b/WebCore/khtml/rendering/render_box.cpp
index 8aa16f2..bf6d53b 100644
--- a/WebCore/khtml/rendering/render_box.cpp
+++ b/WebCore/khtml/rendering/render_box.cpp
@@ -992,7 +992,7 @@ void RenderBox::calcAbsoluteVertical()
     Length hl = cb->style()->height();
     if (hl.isFixed())
         ch = hl.value + cb->paddingTop()
-             + cb->paddingBottom();
+             + cb->paddingBottom() + cb->borderTop() + cb->borderBottom();
     else if (cb->isHtml())
         ch = cb->availableHeight();
     else
@@ -1038,17 +1038,16 @@ void RenderBox::calcAbsoluteVertical()
         while ( ro && ro->isPositioned())
             ro = ro->previousSibling();
 
-        if (ro) static_top = ro->yPos()+ro->marginBottom()+ro->height();
-
+        if (ro)
+            static_top = ro->yPos() + ro->marginBottom() + ro->height();
+        
         for (RenderObject* po = parent(); po && po != cb; po = po->parent())
-            static_top+=po->yPos();
-            
+            static_top += po->yPos();
+        
         if (h==AUTO || style()->top().isStatic())
             t = static_top;
     }
 
-
-
     if (t!=AUTO && h!=AUTO && b!=AUTO)
     {
         // top, height, bottom all given, play with margins

-- 
WebKit Debian packaging