Changeset 29885 in webkit

Timestamp:

Jan 31, 2008 10:34:17 AM (16 years ago)

Author:

mitz@apple.com

Message:

WebCore:

Reviewed by Dave Hyatt.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=17107 <rdar://problem/5716722> REGRESSION (r29834): Article text on redhat.com magazine site appears to be painting twice

Test: fast/block/float/intruding-painted-twice.html

• rendering/RenderBlock.cpp: (WebCore::RenderBlock::layoutBlock): Pass 'false' for the new makeChildPaintOtherFloats parameter to addOverhangingFloats() because at this point we are only taking away floats from the child. (WebCore::RenderBlock::layoutBlockChildren): Pass 'true' for the new makeChildPaintOtherFloats parameter to addOverhangingFloats() iff the child was not laid out again. Only in that case, it may have overhanging floats that it does not paint because they used to be overhanging from the parent, but now they are not. (WebCore::RenderBlock::addOverhangingFloats): Refined the conditions for making the child paint the float: require that the float be a descendant of the child (the other case is when it intrudes into the child from another sibling) and that it does not have a layer (in which case it paints itself). In addition, do the check only if the caller passed 'true' for the makeChildPaintOtherFloats parameter.
• rendering/RenderBlock.h:

LayoutTests:

Reviewed by Dave Hyatt.

• pixel test for ​http://bugs.webkit.org/show_bug.cgi?id=17107 <rdar://problem/5716722> REGRESSION (r29834): Article text on redhat.com magazine site appears to be painting twice

• fast/block/float/intruding-painted-twice.html: Added.
• platform/mac-leopard/fast/block/float/intruding-painted-twice-expected.checksum: Added.
• platform/mac-leopard/fast/block/float/intruding-painted-twice-expected.png: Added.
• platform/mac/fast/block/float/intruding-painted-twice-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/block/float/intruding-painted-twice.html (added)
• LayoutTests/platform/mac-leopard/fast/block/float/intruding-painted-twice-expected.checksum (added)
• LayoutTests/platform/mac-leopard/fast/block/float/intruding-painted-twice-expected.png (added)
• LayoutTests/platform/mac/fast/block/float/intruding-painted-twice-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderBlock.cpp (modified) (5 diffs)
• WebCore/rendering/RenderBlock.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-01-31  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Dave Hyatt.
+
+        - pixel test for http://bugs.webkit.org/show_bug.cgi?id=17107
+          <rdar://problem/5716722> REGRESSION (r29834): Article text on redhat.com magazine site appears to be painting twice
+
+        * fast/block/float/intruding-painted-twice.html: Added.
+        * platform/mac-leopard/fast/block/float/intruding-painted-twice-expected.checksum: Added.
+        * platform/mac-leopard/fast/block/float/intruding-painted-twice-expected.png: Added.
+        * platform/mac/fast/block/float/intruding-painted-twice-expected.txt: Added.
+
 2008-01-30  Dan Bernstein  <mitz@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-01-31  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Dave Hyatt.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=17107
+          <rdar://problem/5716722> REGRESSION (r29834): Article text on redhat.com magazine site appears to be painting twice
+
+        Test: fast/block/float/intruding-painted-twice.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::layoutBlock): Pass 'false' for the new
+        makeChildPaintOtherFloats parameter to addOverhangingFloats() because at
+        this point we are only taking away floats from the child.
+        (WebCore::RenderBlock::layoutBlockChildren): Pass 'true' for the new
+        makeChildPaintOtherFloats parameter to addOverhangingFloats() iff the
+        child was not laid out again. Only in that case, it may have overhanging
+        floats that it does not paint because they used to be overhanging from
+        the parent, but now they are not.
+        (WebCore::RenderBlock::addOverhangingFloats): Refined the conditions for
+        making the child paint the float: require that the float be a descendant
+        of the child (the other case is when it intrudes into the child from
+        another sibling) and that it does not have a layer (in which case it
+        paints itself). In addition, do the check only if the caller passed
+        'true' for the makeChildPaintOtherFloats parameter.
+        * rendering/RenderBlock.h:
+
 2008-01-30  Dan Bernstein  <mitz@apple.com>
 

trunk/WebCore/rendering/RenderBlock.cpp

@@ -604 +604 @@
                     RenderBlock* block = static_cast<RenderBlock*>(child);
                     if (block->floatBottom() + block->yPos() > m_height)
-                        addOverhangingFloats(block, -block->xPos(), -block->yPos());
+                        addOverhangingFloats(block, -block->xPos(), -block->yPos(), false);
                 }
             }
@@ -1226 +1226 @@
             previousFloatBottom = max(previousFloatBottom, oldRect.y() + static_cast<RenderBlock*>(child)->floatBottom());
 
-        child->layoutIfNeeded();
+        bool childNeededLayout = child->needsLayout();
+        if (childNeededLayout)
+            child->layout();
 
         // Now determine the correct ypos based off examination of collapsing margin
@@ -1252 +1254 @@
         // If the child has overhanging floats that intrude into following siblings (or possibly out
         // of this block), then the parent gets notified of the floats now.
-        maxFloatBottom = max(maxFloatBottom, addOverhangingFloats(static_cast<RenderBlock *>(child), -child->xPos(), -child->yPos()));
+        maxFloatBottom = max(maxFloatBottom, addOverhangingFloats(static_cast<RenderBlock *>(child), -child->xPos(), -child->yPos(), !childNeededLayout));
 
         // Update our overflow in case the child spills out the block.
@@ -2648 +2650 @@
 }
 
-int RenderBlock::addOverhangingFloats(RenderBlock* child, int xoff, int yoff)
+int RenderBlock::addOverhangingFloats(RenderBlock* child, int xoff, int yoff, bool makeChildPaintOtherFloats)
 {
     // Prevent floats from being added to the canvas by the root element, e.g., <html>.
@@ -2690 +2692 @@
                 m_floatingObjects->append(floatingObj);
             }
-        } else
+        } else if (makeChildPaintOtherFloats && r->noPaint && !r->node->hasLayer() && r->node->isDescendantOf(child))
+            // The float is not overhanging from this block, so if it is a descendant of the child, the child should
+            // paint it (the other case is that it is intruding into the child), unless it has its own layer.
+            // If makeChildPaintOtherFloats is false, it means that the child must already know about all the floats
+            // it should paint.
             r->noPaint = false;
 

trunk/WebCore/rendering/RenderBlock.h

@@ -177 +177 @@
     virtual bool hasOverhangingFloats() { return !hasColumns() && floatBottom() > m_height; }
     void addIntrudingFloats(RenderBlock* prev, int xoffset, int yoffset);
-    int addOverhangingFloats(RenderBlock* child, int xoffset, int yoffset);
+    int addOverhangingFloats(RenderBlock* child, int xoffset, int yoffset, bool makeChildPaintOtherFloats);
 
     int nearestFloatBottom(int height) const;