[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 e68984c18b85bdc21e1d1e3dd73d2d0ca8251775
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 22 20:46:52 2003 +0000

    	Fix for 3126927, don't let absolute positioned blocks grow
    	to accommodate content.  They overflow instead.
    
            Reviewed by mjs
    
            * khtml/rendering/render_box.cpp:
            (RenderBox::calcAbsoluteVertical):
            * khtml/rendering/render_flow.h:
            * khtml/rendering/render_object.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3402 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 84ded05..9c0f466 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,17 @@
 2003-01-22  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3126927, don't let absolute positioned blocks grow
+	to accommodate content.  They overflow instead.
+	
+        Reviewed by mjs
+
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::calcAbsoluteVertical):
+        * khtml/rendering/render_flow.h:
+        * khtml/rendering/render_object.h:
+
+2003-01-22  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3153316, selection busted on google.com.  For now keep
 	mouse events grabbing the absolutePosition of elements, and don't
 	ever let them grab the absolutePosition of text nodes.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 84ded05..9c0f466 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,17 @@
 2003-01-22  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3126927, don't let absolute positioned blocks grow
+	to accommodate content.  They overflow instead.
+	
+        Reviewed by mjs
+
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::calcAbsoluteVertical):
+        * khtml/rendering/render_flow.h:
+        * khtml/rendering/render_object.h:
+
+2003-01-22  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3153316, selection busted on google.com.  For now keep
 	mouse events grabbing the absolutePosition of elements, and don't
 	ever let them grab the absolutePosition of text nodes.
diff --git a/WebCore/khtml/rendering/render_box.cpp b/WebCore/khtml/rendering/render_box.cpp
index a0d54a4..8aa16f2 100644
--- a/WebCore/khtml/rendering/render_box.cpp
+++ b/WebCore/khtml/rendering/render_box.cpp
@@ -1010,11 +1010,13 @@ void RenderBox::calcAbsoluteVertical()
     {
         h = style()->height().width(ch);
         
-        // This is actually totally wrong, since it grows the positioned element to
-        // wrap its content, when the content should instead overflow out just like
-        // non-positioned blocks do.  For now at least handle overflow: hidden.
-        if (style()->overflow() != OHIDDEN && m_height-pab>h)
-            h=m_height-pab;
+        if (m_height-pab > h) {
+            if (style()->overflow() == OHIDDEN)
+                setOverflowHeight(h+pab);
+            else
+                setOverflowHeight(m_height + pab - (paddingBottom() + borderBottom()));
+            m_height = h+pab;
+        }
     }
     else if (isReplaced())
         h = intrinsicHeight();
diff --git a/WebCore/khtml/rendering/render_flow.h b/WebCore/khtml/rendering/render_flow.h
index 0733fab..d3b0375 100644
--- a/WebCore/khtml/rendering/render_flow.h
+++ b/WebCore/khtml/rendering/render_flow.h
@@ -174,6 +174,8 @@ public:
     // it would have an overflow height of borderTop() + paddingTop() + 100px.
     virtual int overflowHeight() const { return m_overflowHeight; }
     virtual int overflowWidth() const { return m_overflowWidth; }
+    virtual void setOverflowHeight(int h) { m_overflowHeight = h; }
+    virtual void setOverflowWidth(int w) { m_overflowWidth = w; }
     
     virtual bool isSelfCollapsingBlock() const { return m_height == 0; }
     virtual bool isTopMarginQuirk() const { return m_topMarginQuirk; }
diff --git a/WebCore/khtml/rendering/render_object.h b/WebCore/khtml/rendering/render_object.h
index 6897977..4bdd6f4 100644
--- a/WebCore/khtml/rendering/render_object.h
+++ b/WebCore/khtml/rendering/render_object.h
@@ -393,6 +393,8 @@ public:
     // it would have an overflow height of borderTop() + paddingTop() + 100px.
     virtual int overflowHeight() const { return height(); }
     virtual int overflowWidth() const { return width(); }
+    virtual void setOverflowHeight(int) {}
+    virtual void setOverflowWidth(int) {}
     
     // IE extensions. Used to calculate offsetWidth/Height.  Overridden by inlines (render_flow) 
     // to return the remaining width on a given line (and the height of a single line). -dwh

-- 
WebKit Debian packaging