[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 b5f28ccada49741d936a15ce9c1508acb577fea6
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jul 14 19:02:43 2003 +0000

    	Fix for 3294626, no scrollbar on ESPN.  Fix lowestPosition to
    	always crawl into all children.
    
            Reviewed by darin
    
            * khtml/rendering/render_flow.cpp:
            (RenderFlow::lowestPosition):
            (RenderFlow::rightmostPosition):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4647 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 7262517..de75bd9 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2003-07-14  Dave Hyatt  <hyatt at apple.com>
+
+	Fix for 3294626, no scrollbar on ESPN.  Fix lowestPosition to
+	always crawl into all children.
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::lowestPosition):
+        (RenderFlow::rightmostPosition):
+
 2003-07-11  Darin Adler  <darin at apple.com>
 
         Reviewed by Maciej.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 7262517..de75bd9 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2003-07-14  Dave Hyatt  <hyatt at apple.com>
+
+	Fix for 3294626, no scrollbar on ESPN.  Fix lowestPosition to
+	always crawl into all children.
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::lowestPosition):
+        (RenderFlow::rightmostPosition):
+
 2003-07-11  Darin Adler  <darin at apple.com>
 
         Reviewed by Maciej.
diff --git a/WebCore/khtml/rendering/render_flow.cpp b/WebCore/khtml/rendering/render_flow.cpp
index 99eac51..0577b87 100644
--- a/WebCore/khtml/rendering/render_flow.cpp
+++ b/WebCore/khtml/rendering/render_flow.cpp
@@ -266,20 +266,15 @@ RenderFlow::lowestPosition(bool includeOverflowInterior) const
     int bottom = RenderBox::lowestPosition(includeOverflowInterior);
     if (!includeOverflowInterior && style()->hidesOverflow())
         return bottom;
-    
-    // FIXME: It's not OK to look only at the last non-floating
-    // non-positioned child (e.g., negative margins, or a child that itself has
-    // overflow that goes beyond the last child).  We want to switch over to using overflow,
-    // but we tried it and it didn't work, so there must be some issues with overflow that
-    // still need to be worked out.    
-    bool checkOverhangsOnly = !isRenderBlock() && overhangingContents();
-    if (isRenderBlock() || checkOverhangsOnly) {
-        for (RenderObject *c = lastChild(); c; c = c->previousSibling()) {
-            if (!c->isFloatingOrPositioned() && (!checkOverhangsOnly || c->overhangingContents())) {
-                int lp = c->yPos() + c->lowestPosition(false);
-                bottom = QMAX(bottom, lp);
-                break;
-            }
+
+    // FIXME: Come up with a way to use the layer tree to avoid visiting all the kids.
+    // For now, we have to descend into all the children, since we may have a huge abs div inside
+    // a tiny rel div buried somewhere deep in our child tree.  In this case we have to get to
+    // the abs div.
+    for (RenderObject *c = firstChild(); c; c = c->nextSibling()) {
+        if (!c->isFloatingOrPositioned()) {
+            int lp = c->yPos() + c->lowestPosition(false);
+            bottom = QMAX(bottom, lp);
         }
     }
     
@@ -291,10 +286,11 @@ int RenderFlow::rightmostPosition(bool includeOverflowInterior) const
     int right = RenderBox::rightmostPosition(includeOverflowInterior);
     if (!includeOverflowInterior && style()->hidesOverflow())
         return right;
-    
-    // FIXME: We want to switch over to using overflow,
-    // but we tried it and it didn't work, so there must be some issues with overflow that
-    // still need to be worked out.
+
+    // FIXME: Come up with a way to use the layer tree to avoid visiting all the kids.
+    // For now, we have to descend into all the children, since we may have a huge abs div inside
+    // a tiny rel div buried somewhere deep in our child tree.  In this case we have to get to
+    // the abs div.
     for (RenderObject *c = firstChild(); c; c = c->nextSibling()) {
         if (!c->isFloatingOrPositioned()) {
             int rp = c->xPos() + c->rightmostPosition(false);

-- 
WebKit Debian packaging