[CSS Shapes] content inside second shape area when two floats interact
authorbjonesbe@adobe.com <bjonesbe@adobe.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 9 Jan 2015 21:01:53 +0000 (21:01 +0000)
committerbjonesbe@adobe.com <bjonesbe@adobe.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 9 Jan 2015 21:01:53 +0000 (21:01 +0000)
commita9bfa9a33df5215eb46e81153c3d3e40819a8cbf
tree567673ebecdc8cbdbcf1fc2d3230006d9832228a
parent908b6b7a5a0361eddc459b7bf9bac2592074924f
[CSS Shapes] content inside second shape area when two floats interact
https://bugs.webkit.org/show_bug.cgi?id=137702

Reviewed by Zalan Bujtas.

Source/WebCore:

If a float has a shape-outside, we cannot assume that it has a uniform
width for the height of the float, so we cannot use simple line
layout.

Test: fast/shapes/shape-outside-floats/shape-outside-text-overlap-float.html

* rendering/SimpleLineLayout.cpp:
(WebCore::SimpleLineLayout::canUseFor): Don't use simple line layout
    if we have shape-outside. Also, rename floatRenderer to
    floatingObject, since the variable doesn't contain a renderer.

LayoutTests:

* fast/shapes/shape-outside-floats/shape-outside-text-overlap-float-expected.html: Added.
* fast/shapes/shape-outside-floats/shape-outside-text-overlap-float.html: Added.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@178192 268f45cc-cd09-0410-ab3c-d52691b4dbfc
LayoutTests/ChangeLog
LayoutTests/fast/shapes/shape-outside-floats/shape-outside-text-overlap-float-expected.html [new file with mode: 0644]
LayoutTests/fast/shapes/shape-outside-floats/shape-outside-text-overlap-float.html [new file with mode: 0644]
Source/WebCore/ChangeLog
Source/WebCore/rendering/SimpleLineLayout.cpp