Changeset 29834 in webkit

Timestamp:

Jan 28, 2008 9:40:34 AM (16 years ago)

Author:

mitz@apple.com

Message:

WebCore:

Reviewed by Darin Adler.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=16774 REGRESSION (r27464-r27504) javascript popup menu does not display 'close' button

Test: fast/dynamic/float-no-longer-overhanging.html

• rendering/RenderBlock.cpp: (WebCore::RenderBlock::addOverhangingFloats): If a child's float turns out not to be overhanging at this time, ensure that the child paints it.

LayoutTests:

Reviewed by Darin Adler.

• pixel test for ​http://bugs.webkit.org/show_bug.cgi?id=16774 REGRESSION (r27464-r27504) javascript popup menu does not display 'close' button

• fast/dynamic/float-no-longer-overhanging.html: Added.
• platform/mac/fast/dynamic/float-no-longer-overhanging-expected.checksum: Added.
• platform/mac/fast/dynamic/float-no-longer-overhanging-expected.png: Added.
• platform/mac/fast/dynamic/float-no-longer-overhanging-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dynamic/float-no-longer-overhanging.html (added)
• LayoutTests/platform/mac/fast/dynamic/float-no-longer-overhanging-expected.checksum (added)
• LayoutTests/platform/mac/fast/dynamic/float-no-longer-overhanging-expected.png (added)
• LayoutTests/platform/mac/fast/dynamic/float-no-longer-overhanging-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderBlock.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-01-28  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        - pixel test for http://bugs.webkit.org/show_bug.cgi?id=16774
+          REGRESSION (r27464-r27504) javascript popup menu does not display 'close' button
+
+        * fast/dynamic/float-no-longer-overhanging.html: Added.
+        * platform/mac/fast/dynamic/float-no-longer-overhanging-expected.checksum: Added.
+        * platform/mac/fast/dynamic/float-no-longer-overhanging-expected.png: Added.
+        * platform/mac/fast/dynamic/float-no-longer-overhanging-expected.txt: Added.
+
 2008-01-28  Oliver Hunt  <oliver@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-01-28  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=16774
+          REGRESSION (r27464-r27504) javascript popup menu does not display 'close' button
+
+        Test: fast/dynamic/float-no-longer-overhanging.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::addOverhangingFloats): If a child's float turns
+        out not to be overhanging at this time, ensure that the child paints it.
+
 2008-01-28  Oliver Hunt  <oliver@apple.com>
 

trunk/WebCore/rendering/RenderBlock.cpp

@@ -2690 +2690 @@
                 m_floatingObjects->append(floatingObj);
             }
-        }
+        } else
+            r->noPaint = false;
+
         if (!r->noPaint && !r->node->hasLayer()) {
             IntRect floatOverflowRect = r->node->overflowRect(false);