|
Stacked floats with shape-outside should allow inline content to interact with the non-outermost float
Make inline content interact with stacked floats with shape-outside per
the spec. This means that content can interact with floats on the line
that are not the outermost float.
This refactors ComputeFloatOffsetAdapter into a superclass and two
subclasses: one adaptor for determining the offset for float layout, and
one for determining the offset for inline layout.
The logic in LineWidth::shrinkAvailableWidthForNewFloatIfNeeded has been
updated to handle stacked floats with shape-outside properly and has
been considerably simplified in the process. It was previously doing a
whole bunch of unnecessary work.
This is a port from WebKit of http://trac.webkit.org/changeset/162217
BUG= 249140
Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=168155
Total comments: 1
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+305 lines, -107 lines) |
Patch |
|
A |
LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-stacked-000.html
|
View
|
|
1 chunk |
+55 lines, -0 lines |
0 comments
|
Download
|
|
A + |
LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-stacked-000-expected.html
|
View
|
|
1 chunk |
+4 lines, -5 lines |
0 comments
|
Download
|
|
A |
LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-stacked-001.html
|
View
|
|
1 chunk |
+55 lines, -0 lines |
0 comments
|
Download
|
|
A + |
LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-stacked-001-expected.html
|
View
|
|
1 chunk |
+4 lines, -5 lines |
0 comments
|
Download
|
|
A |
LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-stacked-002.html
|
View
|
|
1 chunk |
+57 lines, -0 lines |
0 comments
|
Download
|
|
A + |
LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-stacked-002-expected.html
|
View
|
|
1 chunk |
+4 lines, -5 lines |
0 comments
|
Download
|
|
M |
Source/core/rendering/FloatingObjects.cpp
|
View
|
1
2
|
9 chunks |
+103 lines, -55 lines |
0 comments
|
Download
|
|
M |
Source/core/rendering/line/LineWidth.cpp
|
View
|
1
|
1 chunk |
+15 lines, -31 lines |
0 comments
|
Download
|
|
M |
Source/core/rendering/shapes/ShapeOutsideInfo.h
|
View
|
|
2 chunks |
+6 lines, -1 line |
0 comments
|
Download
|
|
M |
Source/core/rendering/shapes/ShapeOutsideInfo.cpp
|
View
|
|
2 chunks |
+2 lines, -5 lines |
0 comments
|
Download
|
Total messages: 14 (0 generated)
|