Commit 0d9d2dc5 authored by hyatt@apple.com's avatar hyatt@apple.com

https://bugs.webkit.org/show_bug.cgi?id=52987

        
Reviewed by Simon Fraser.

REGRESSION: Overflowing columns not repainted correctly
        
Make sure to add in column overflow as visual overflow as well.  It was only propagating layout overflow, which is obviously not
sufficient, since blocks paint their own columns.

Added fast/multicol/scrolling-overflow.html

Source/WebCore: 

* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::addOverflowFromChildren):

LayoutTests: 

* fast/multicol/scrolling-overflow.html: Added.
* platform/mac/fast/multicol/scrolling-overflow-expected.checksum: Added.
* platform/mac/fast/multicol/scrolling-overflow-expected.png: Added.
* platform/mac/fast/multicol/scrolling-overflow-expected.txt: Added.



git-svn-id: svn://svn.chromium.org/blink/trunk@80883 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent f34e21fe
2011-03-11 David Hyatt <hyatt@apple.com>
Reviewed by Simon Fraser.
https://bugs.webkit.org/show_bug.cgi?id=52987
REGRESSION: Overflowing columns not repainted correctly
Make sure to add in column overflow as visual overflow as well. It was only propagating layout overflow, which is obviously not
sufficient, since blocks paint their own columns.
Added fast/multicol/scrolling-overflow.html
* fast/multicol/scrolling-overflow.html: Added.
* platform/mac/fast/multicol/scrolling-overflow-expected.checksum: Added.
* platform/mac/fast/multicol/scrolling-overflow-expected.png: Added.
* platform/mac/fast/multicol/scrolling-overflow-expected.txt: Added.
2011-03-11 Mihai Parparita <mihaip@chromium.org> 2011-03-11 Mihai Parparita <mihaip@chromium.org>
Mac and Chromium expectations update. Remove failing expectations for Mac and Chromium expectations update. Remove failing expectations for
2011-03-11 David Hyatt <hyatt@apple.com>
Reviewed by Simon Fraser.
https://bugs.webkit.org/show_bug.cgi?id=52987
REGRESSION: Overflowing columns not repainted correctly
Make sure to add in column overflow as visual overflow as well. It was only propagating layout overflow, which is obviously not
sufficient, since blocks paint their own columns.
Added fast/multicol/scrolling-overflow.html
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::addOverflowFromChildren):
2011-03-11 Matthew Delaney <mdelaney@apple.com> 2011-03-11 Matthew Delaney <mdelaney@apple.com>
Reviewed by Simon Fraser. Reviewed by Simon Fraser.
......
...@@ -1328,12 +1328,16 @@ void RenderBlock::addOverflowFromChildren() ...@@ -1328,12 +1328,16 @@ void RenderBlock::addOverflowFromChildren()
int overflowRight = style()->isLeftToRightDirection() ? max(width(), lastRect.maxX()) : 0; int overflowRight = style()->isLeftToRightDirection() ? max(width(), lastRect.maxX()) : 0;
int overflowHeight = borderBefore() + paddingBefore() + colInfo->columnHeight(); int overflowHeight = borderBefore() + paddingBefore() + colInfo->columnHeight();
addLayoutOverflow(IntRect(overflowLeft, 0, overflowRight - overflowLeft, overflowHeight)); addLayoutOverflow(IntRect(overflowLeft, 0, overflowRight - overflowLeft, overflowHeight));
if (!hasOverflowClip())
addVisualOverflow(IntRect(overflowLeft, 0, overflowRight - overflowLeft, overflowHeight));
} else { } else {
IntRect lastRect = columnRectAt(colInfo, columnCount(colInfo) - 1); IntRect lastRect = columnRectAt(colInfo, columnCount(colInfo) - 1);
int overflowTop = !style()->isLeftToRightDirection() ? min(0, lastRect.y()) : 0; int overflowTop = !style()->isLeftToRightDirection() ? min(0, lastRect.y()) : 0;
int overflowBottom = style()->isLeftToRightDirection() ? max(height(), lastRect.maxY()) : 0; int overflowBottom = style()->isLeftToRightDirection() ? max(height(), lastRect.maxY()) : 0;
int overflowWidth = borderBefore() + paddingBefore() + colInfo->columnHeight(); int overflowWidth = borderBefore() + paddingBefore() + colInfo->columnHeight();
addLayoutOverflow(IntRect(0, overflowTop, overflowWidth, overflowBottom - overflowTop)); addLayoutOverflow(IntRect(0, overflowTop, overflowWidth, overflowBottom - overflowTop));
if (!hasOverflowClip())
addVisualOverflow(IntRect(0, overflowTop, overflowWidth, overflowBottom - overflowTop));
} }
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment