Changeset 105772 in webkit

Timestamp:

Jan 24, 2012 12:24:11 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

REGRESSION (r73385): Marquee with behavior="alternate" is not working
​https://bugs.webkit.org/show_bug.cgi?id=64230

Patch by Parag Radke <​nrqv63@motorola.com> on 2012-01-24
Reviewed by Simon Fraser.

Source/WebCore:

This patch gives correct content width for marquee, which computes
correct start position to scroll marquee.

Test: fast/html/marquee-alternate.html

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::computePreferredLogicalWidths):
We need(style()->marqueeBehavior() != MALTERNATE) check as we always need the marquee's
actual content width to compute the initial/end position in case of 'MALTERNATE'.
So we need to calculate the logical width in Alternate case even if fixed width is specified
as content has to animate between renderBox().right().x() - contentWidth() and
renderBox().left().x() + contentWidth().

• rendering/RenderMarquee.cpp:

(WebCore::RenderMarquee::computePosition):
Using PreferredLogicalWidth in place of LayoutOverflow for calculating correct content width.

LayoutTests:

Added a test case to check marquee alternate behavior with fixed width.

• fast/html/marquee-alternate-expected.txt: Added.
• fast/html/marquee-alternate.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/html/marquee-alternate-expected.txt (added)
• LayoutTests/fast/html/marquee-alternate.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderMarquee.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-01-24  Parag Radke  <nrqv63@motorola.com>
+
+        REGRESSION (r73385): Marquee with behavior="alternate" is not working
+        https://bugs.webkit.org/show_bug.cgi?id=64230
+
+        Reviewed by Simon Fraser.
+
+        Added a test case to check marquee alternate behavior with fixed width.
+
+        * fast/html/marquee-alternate-expected.txt: Added.
+        * fast/html/marquee-alternate.html: Added.
+
 2012-01-24  Abhishek Arya  <inferno@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-24  Parag Radke  <nrqv63@motorola.com>
+
+        REGRESSION (r73385): Marquee with behavior="alternate" is not working
+        https://bugs.webkit.org/show_bug.cgi?id=64230
+
+        Reviewed by Simon Fraser.
+
+        This patch gives correct content width for marquee, which computes
+        correct start position to scroll marquee.
+
+        Test: fast/html/marquee-alternate.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::computePreferredLogicalWidths):
+        We need(style()->marqueeBehavior() != MALTERNATE) check as we always need the marquee's 
+        actual content width to compute the initial/end position in case of 'MALTERNATE'.
+        So we need to calculate the logical width in Alternate case even if fixed width is specified
+        as content has to animate between renderBox().right().x() - contentWidth() and 
+        renderBox().left().x() + contentWidth().
+        
+        * rendering/RenderMarquee.cpp:
+        (WebCore::RenderMarquee::computePosition):
+        Using PreferredLogicalWidth in place of LayoutOverflow for calculating correct content width.
+
 2012-01-24  Andreas Kling  <awesomekling@apple.com>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -4951 +4951 @@
 
     RenderStyle* styleToUse = style();
-    if (!isTableCell() && styleToUse->logicalWidth().isFixed() && styleToUse->logicalWidth().value() > 0)
+    if (!isTableCell() && styleToUse->logicalWidth().isFixed() && styleToUse->logicalWidth().value() > 0 && style()->marqueeBehavior() != MALTERNATE)
         m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = computeContentBoxLogicalWidth(styleToUse->logicalWidth().value());
     else {

trunk/Source/WebCore/rendering/RenderMarquee.cpp

@@ -117 +117 @@
         bool ltr = s->isLeftToRightDirection();
         int clientWidth = box->clientWidth();
-        int contentWidth = ltr ? box->maxXLayoutOverflow() : box->minXLayoutOverflow();
+        int contentWidth = ltr ? box->maxPreferredLogicalWidth() : box->minPreferredLogicalWidth();
         if (ltr)
             contentWidth += (box->paddingRight() - box->borderLeft());