REGRESSION (r155854 - r155967) block with margin-left adjacent to floated block cause...
[WebKit-https.git] / Source / WebCore / ChangeLog
index 0544050..1febb31 100644 (file)
@@ -1,3 +1,19 @@
+2013-09-18  Bem Jones-Bey  <bjonesbe@adobe.com>
+
+        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.
+
+        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):
+
 2013-09-18  Ryosuke Niwa  <rniwa@webkit.org>
 
         Merge HTMLBodyElement::didNotifySubtreeInsertions into HTMLBodyElement::insertedInto