|
Add support for printing multicol containers, and enable it.
Introduce an abstract class FragmentationContext, which is either implemented
by LayoutMultiColumnFlowThread for multicol, or by the new
ViewFragmentationContext class, which is attached to a LayoutView when
printing. This way it will act as an enclosing fragmentation context for a
multicol container in the document. This is similar to how an outer multicol
container acts as an enclosing fragmentation context for an inner multicol
container.
The multicol flow thread implementation will now obtain and use a
FragmentationContext when attempting to locate its enclosing fragmentation
context, rather than only looking for another flowthread up there (and assume
that it's not nested if none was found). A big part of this CL is to teach the
multicol implementation about this, which means that there are quite a few
mechanical changes from enclosingFlowThread() (and LayoutMultiColumnFlowThread
method calls) to enclosingFragmentationContext() (and FragmentationContext
method calls).
Replaced an old printing test that tested that multicol didn't work, with one
that tests that multicol does work. :)
Also added another test that splits a multicol container over two pages.
BUG= 99358
R=leviw@chromium.org
Committed: https://crrev.com/562a7409200d3bffd2e1270e227e36d87724a07c
Cr-Commit-Position: refs/heads/master@{#363838}
Total comments: 4
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+326 lines, -84 lines) |
Patch |
|
M |
third_party/WebKit/LayoutTests/inspector/elements/styles-2/media-emulation-expected.txt
|
View
|
1
2
|
1 chunk |
+0 lines, -5 lines |
0 comments
|
Download
|
|
A |
third_party/WebKit/LayoutTests/printing/multicol.html
|
View
|
|
1 chunk |
+22 lines, -0 lines |
0 comments
|
Download
|
|
A |
third_party/WebKit/LayoutTests/printing/multicol-2-pages.html
|
View
|
|
1 chunk |
+38 lines, -0 lines |
0 comments
|
Download
|
|
A |
third_party/WebKit/LayoutTests/printing/multicol-2-pages-expected.html
|
View
|
|
1 chunk |
+52 lines, -0 lines |
0 comments
|
Download
|
|
A |
third_party/WebKit/LayoutTests/printing/multicol-expected.txt
|
View
|
|
1 chunk |
+21 lines, -0 lines |
0 comments
|
Download
|
|
D |
third_party/WebKit/LayoutTests/printing/multicol-not-supported.html
|
View
|
|
1 chunk |
+0 lines, -21 lines |
0 comments
|
Download
|
|
D |
third_party/WebKit/LayoutTests/printing/multicol-not-supported-expected.txt
|
View
|
|
1 chunk |
+0 lines, -19 lines |
0 comments
|
Download
|
|
M |
third_party/WebKit/Source/core/core.gypi
|
View
|
1
2
3
|
2 chunks |
+3 lines, -0 lines |
0 comments
|
Download
|
|
M |
third_party/WebKit/Source/core/css/html.css
|
View
|
|
1 chunk |
+0 lines, -6 lines |
0 comments
|
Download
|
|
M |
third_party/WebKit/Source/core/layout/ColumnBalancer.cpp
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
A |
third_party/WebKit/Source/core/layout/FragmentationContext.h
|
View
|
1
|
1 chunk |
+53 lines, -0 lines |
0 comments
|
Download
|
|
M |
third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.h
|
View
|
|
4 chunks |
+13 lines, -5 lines |
0 comments
|
Download
|
|
M |
third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.cpp
|
View
|
|
5 chunks |
+35 lines, -10 lines |
0 comments
|
Download
|
|
M |
third_party/WebKit/Source/core/layout/LayoutMultiColumnSet.cpp
|
View
|
|
3 chunks |
+4 lines, -4 lines |
0 comments
|
Download
|
|
M |
third_party/WebKit/Source/core/layout/LayoutView.h
|
View
|
|
3 chunks |
+4 lines, -0 lines |
0 comments
|
Download
|
|
M |
third_party/WebKit/Source/core/layout/LayoutView.cpp
|
View
|
1
2
3
|
2 chunks |
+9 lines, -1 line |
0 comments
|
Download
|
|
M |
third_party/WebKit/Source/core/layout/MultiColumnFragmentainerGroup.h
|
View
|
|
1 chunk |
+3 lines, -3 lines |
0 comments
|
Download
|
|
M |
third_party/WebKit/Source/core/layout/MultiColumnFragmentainerGroup.cpp
|
View
|
|
5 chunks |
+10 lines, -9 lines |
0 comments
|
Download
|
|
A |
third_party/WebKit/Source/core/layout/ViewFragmentationContext.h
|
View
|
|
1 chunk |
+27 lines, -0 lines |
0 comments
|
Download
|
|
A |
third_party/WebKit/Source/core/layout/ViewFragmentationContext.cpp
|
View
|
|
1 chunk |
+31 lines, -0 lines |
0 comments
|
Download
|
Total messages: 17 (4 generated)
|