REGRESSION (r155854 - r155967) block with margin-left adjacent to floated block cause...
authorbjonesbe@adobe.com <bjonesbe@adobe.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 19 Sep 2013 01:31:11 +0000 (01:31 +0000)
committerbjonesbe@adobe.com <bjonesbe@adobe.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 19 Sep 2013 01:31:11 +0000 (01:31 +0000)
commit4af9f58602556a280bafd74778c543f06b19f7cb
tree225fcf075fe61ad13a344b68a3d02e1aca90c48a
parentab130b65315109eac7bba1f130f7389af8ecf130
REGRESSION (r155854 - r155967) block with margin-left adjacent to floated block causes text of subsequent blocks to overlap the floated block.
https://bugs.webkit.org/show_bug.cgi?id=121532

Reviewed by Andreas Kling.

Source/WebCore:

When refactoring the code, I ended up adding the margin in instead of
subtracting it in the case of an intruding float. This patch fixes
that so that the margin is properly handled.

Test: fast/block/float/intruding-float-sibling-with-margin.html

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

LayoutTests:

* fast/block/float/intruding-float-sibling-with-margin-expected.html: Added.
* fast/block/float/intruding-float-sibling-with-margin.html: Added.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@156075 268f45cc-cd09-0410-ab3c-d52691b4dbfc
LayoutTests/ChangeLog
LayoutTests/fast/block/float/intruding-float-sibling-with-margin-expected.html [new file with mode: 0644]
LayoutTests/fast/block/float/intruding-float-sibling-with-margin.html [new file with mode: 0644]
Source/WebCore/ChangeLog
Source/WebCore/rendering/RenderBlock.cpp