Source/WebCore: https://bugs.webkit.org/show_bug.cgi?id=78157
authorhyatt@apple.com <hyatt@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 9 Feb 2012 01:50:05 +0000 (01:50 +0000)
committerhyatt@apple.com <hyatt@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 9 Feb 2012 01:50:05 +0000 (01:50 +0000)
commit989d21792f1ef8345eb3010438ec1541e56f5c18
tree084430a5b43adffbba0bef29a26526c80d2dd666
parenta3813850f78c0370c2e4f97eb80bde51fdb0dc01
Source/WebCore: https://bugs.webkit.org/show_bug.cgi?id=78157

Make multi-column layout work with line grids that are outside of the multi-column
block.

Reviewed by Dan Bernstein.

Added new tests in fast/line-grid.

* rendering/LayoutState.cpp:
(WebCore::LayoutState::LayoutState):
(WebCore::LayoutState::propagateLineGridInfo):
(WebCore::LayoutState::establishLineGrid):
(WebCore):
(WebCore::LayoutState::computeLineGridPaginationOrigin):
* rendering/LayoutState.h:
(WebCore::LayoutState::LayoutState):
(WebCore::LayoutState::lineGrid):
(WebCore::LayoutState::lineGridOffset):
(WebCore::LayoutState::lineGridPaginationOrigin):
(WebCore::LayoutState::needsBlockDirectionLocationSetBeforeLayout):
(LayoutState):
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::layoutBlockChildren):
* rendering/RenderBlockLineLayout.cpp:
(WebCore::RenderBlock::layoutInlineChildren):
* rendering/RenderView.h:
(WebCore::RenderView::pushLayoutState):
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::lineGridSnapAdjustment):

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

Make multi-column layout work with line grids that are outside of the multi-column
block.

Reviewed by Dan Bernstein.

* fast/line-grid/line-grid-into-columns.html: Added.
* platform/mac/fast/line-grid/line-grid-into-columns-expected.png: Added.
* platform/mac/fast/line-grid/line-grid-into-columns-expected.txt: Added.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@107160 268f45cc-cd09-0410-ab3c-d52691b4dbfc
LayoutTests/ChangeLog
LayoutTests/fast/line-grid/line-grid-into-columns.html [new file with mode: 0644]
LayoutTests/platform/mac/fast/line-grid/line-grid-into-columns-expected.png [new file with mode: 0644]
LayoutTests/platform/mac/fast/line-grid/line-grid-into-columns-expected.txt [new file with mode: 0644]
Source/WebCore/ChangeLog
Source/WebCore/rendering/LayoutState.cpp
Source/WebCore/rendering/LayoutState.h
Source/WebCore/rendering/RenderBlock.cpp
Source/WebCore/rendering/RenderBlockLineLayout.cpp
Source/WebCore/rendering/RenderView.h
Source/WebCore/rendering/RootInlineBox.cpp