Fix a screwup in rightmost/lowets position computation. 3955207. Make sure floats...
authorhyatt <hyatt@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 17 Jan 2005 23:27:03 +0000 (23:27 +0000)
committerhyatt <hyatt@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 17 Jan 2005 23:27:03 +0000 (23:27 +0000)
        Reviewed by kocienda

* khtml/rendering/render_block.cpp

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@8388 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog-2005-08-23
WebCore/khtml/rendering/render_block.cpp

index db00fef2ad772c5d16cd31a51d6708461ab6c60f..70a38db87d34db00ea61d034a61e1302b9586873 100644 (file)
@@ -1,3 +1,11 @@
+2005-01-17  David Hyatt  <hyatt@apple.com>
+
+       Fix a screwup in rightmost/lowets position computation.  3955207.  Make sure floats with layers are still checked.
+
+        Reviewed by kocienda
+       
+       * khtml/rendering/render_block.cpp
+
 2005-01-17  Ken Kocienda  <kocienda@apple.com>
 
         Reviewed by John
index b1f9c6fa0f5b6f62c88729f2d60739e3884e46de..f96731822905af01a066bb0b7e538dc261127d98 100644 (file)
@@ -2070,7 +2070,7 @@ RenderBlock::lowestPosition(bool includeOverflowInterior, bool includeSelf) cons
         FloatingObject* r;
         QPtrListIterator<FloatingObject> it(*m_floatingObjects);
         for ( ; (r = it.current()); ++it ) {
-            if (!r->noPaint) {
+            if (!r->noPaint || r->node->layer()) {
                 int lp = r->startY + r->node->marginTop() + r->node->lowestPosition(false);
                 bottom = kMax(bottom, lp);
             }
@@ -2108,7 +2108,7 @@ int RenderBlock::rightmostPosition(bool includeOverflowInterior, bool includeSel
         FloatingObject* r;
         QPtrListIterator<FloatingObject> it(*m_floatingObjects);
         for ( ; (r = it.current()); ++it ) {
-            if (!r->noPaint) {
+            if (!r->noPaint || r->node->layer()) {
                 int rp = r->left + r->node->marginLeft() + r->node->rightmostPosition(false);
                right = kMax(right, rp);
             }
@@ -2146,7 +2146,7 @@ int RenderBlock::leftmostPosition(bool includeOverflowInterior, bool includeSelf
         FloatingObject* r;
         QPtrListIterator<FloatingObject> it(*m_floatingObjects);
         for ( ; (r = it.current()); ++it ) {
-            if (!r->noPaint) {
+            if (!r->noPaint || r->node->layer()) {
                 int lp = r->left + r->node->marginLeft() + r->node->leftmostPosition(false);
                 left = kMin(left, lp);
             }