Changeset 123835 in webkit

Timestamp:

Jul 26, 2012 8:48:18 PM (12 years ago)

Author:

mitz@apple.com

Message:

Blocks with reverse column progression don’t have layout overflow for overflowing columns
​https://bugs.webkit.org/show_bug.cgi?id=92440

Reviewed by Sam Weinig.

Source/WebCore:

Test: fast/multicol/progression-reverse-overflow.html

• rendering/RenderBox.cpp:

(WebCore::RenderBox::addLayoutOverflow): If column progression is reversed, then allow
layout overflow to go in the opposite direction than it would normally be allowed to go.
For example, in a block with writing-mode: horizontal-tb, direction: ltr and
column-progression: reverse, columns overflow to the left, so layout overflow would go on
the left.

LayoutTests:

• fast/multicol/progression-reverse-overflow-expected.html: Added.
• fast/multicol/progression-reverse-overflow.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/multicol/progression-reverse-overflow-expected.html (added)
• LayoutTests/fast/multicol/progression-reverse-overflow.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBox.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-07-26  Dan Bernstein  <mitz@apple.com>
+
+        Blocks with reverse column progression don’t have layout overflow for overflowing columns
+        https://bugs.webkit.org/show_bug.cgi?id=92440
+
+        Reviewed by Sam Weinig.
+
+        * fast/multicol/progression-reverse-overflow-expected.html: Added.
+        * fast/multicol/progression-reverse-overflow.html: Added.
+
 2012-07-26  Sukolsak Sakshuwong  <sukolsak@google.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-26  Dan Bernstein  <mitz@apple.com>
+
+        Blocks with reverse column progression don’t have layout overflow for overflowing columns
+        https://bugs.webkit.org/show_bug.cgi?id=92440
+
+        Reviewed by Sam Weinig.
+
+        Test: fast/multicol/progression-reverse-overflow.html
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::addLayoutOverflow): If column progression is reversed, then allow
+        layout overflow to go in the opposite direction than it would normally be allowed to go.
+        For example, in a block with writing-mode: horizontal-tb, direction: ltr and
+        column-progression: reverse, columns overflow to the left, so layout overflow would go on
+        the left.
+
 2012-07-26  Keishi Hattori  <keishi@webkit.org>
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -3635 +3635 @@
                 hasTopOverflow = true;
         }
-        
+
+        if (hasColumns() && style()->columnProgression() == ReverseColumnProgression) {
+            if (isHorizontalWritingMode() ^ !style()->hasInlineColumnAxis())
+                hasLeftOverflow = !hasLeftOverflow;
+            else
+                hasTopOverflow = !hasTopOverflow;
+        }
+
         if (!hasTopOverflow)
             overflowRect.shiftYEdgeTo(max(overflowRect.y(), clientBox.y()));