Changeset 26674 in webkit

Timestamp:

Oct 16, 2007 1:04:42 PM (17 years ago)

Author:

mitz

Message:

WebCore:

Reviewed by Dave Hyatt.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=15296 REGRESSION (r19716-r19719): width not specified for <marquee> tag is causing the alignment issue.

Test: fast/block/float/marquee-shrink-to-avoid-floats.html

• rendering/RenderObject.cpp: (WebCore::RenderObject::shrinkToAvoidFloats): Changed to return 'true' for <marquee>s with auto width.

LayoutTests:

Reviewed by Dave Hyatt.

• test for ​http://bugs.webkit.org/show_bug.cgi?id=15296 REGRESSION (r19716-r19719): width not specified for <marquee> tag is causing the alignment issue.

• fast/block/float/marquee-shrink-to-avoid-floats.html: Added.
• platform/mac/fast/block: Added.
• platform/mac/fast/block/float: Added.
• platform/mac/fast/block/float/marquee-shrink-to-avoid-floats-expected.checksum: Added.
• platform/mac/fast/block/float/marquee-shrink-to-avoid-floats-expected.png: Added.
• platform/mac/fast/block/float/marquee-shrink-to-avoid-floats-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/block/float/marquee-shrink-to-avoid-floats.html (added)
• LayoutTests/platform/mac/fast/block/float/marquee-shrink-to-avoid-floats-expected.checksum (added)
• LayoutTests/platform/mac/fast/block/float/marquee-shrink-to-avoid-floats-expected.png (added)
• LayoutTests/platform/mac/fast/block/float/marquee-shrink-to-avoid-floats-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderObject.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-10-16  Mitz Pettel  <mitz@webkit.org>
+
+        Reviewed by Dave Hyatt.
+
+        - test for http://bugs.webkit.org/show_bug.cgi?id=15296
+          REGRESSION (r19716-r19719): width not specified for <marquee> tag is causing the alignment issue.
+
+        * fast/block/float/marquee-shrink-to-avoid-floats.html: Added.
+        * platform/mac/fast/block: Added.
+        * platform/mac/fast/block/float: Added.
+        * platform/mac/fast/block/float/marquee-shrink-to-avoid-floats-expected.checksum: Added.
+        * platform/mac/fast/block/float/marquee-shrink-to-avoid-floats-expected.png: Added.
+        * platform/mac/fast/block/float/marquee-shrink-to-avoid-floats-expected.txt: Added.
+
 2007-10-16  Beth Dakin  <bdakin@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-10-16  Mitz Pettel  <mitz@webkit.org>
+
+        Reviewed by Dave Hyatt.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=15296
+          REGRESSION (r19716-r19719): width not specified for <marquee> tag is causing the alignment issue.
+
+        Test: fast/block/float/marquee-shrink-to-avoid-floats.html
+
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::shrinkToAvoidFloats): Changed to return 'true' for <marquee>s with auto width.
+
 2007-10-16  Beth Dakin  <bdakin@apple.com>
 

trunk/WebCore/rendering/RenderObject.cpp

@@ -2928 +2928 @@
     // involves doing a relayout during findNextLineBreak and somehow overriding the containingBlockWidth method to return the
     // current remaining width on a line.
-    if (isInline() || !avoidsFloats())
+    if (isInline() && !isHTMLMarquee() || !avoidsFloats())
         return false;