Title: [237320] trunk/Source/WebCore
Revision
237320
Author
[email protected]
Date
2018-10-22 08:21:59 -0700 (Mon, 22 Oct 2018)

Log Message

[LFC][IFC] Block formatting context roots avoid floats.
https://bugs.webkit.org/show_bug.cgi?id=190723

Reviewed by Antti Koivisto.

Inline formatting context roots don't avoid floats (unless they also establish block formatting context).

* layout/blockformatting/BlockFormattingContext.cpp:
(WebCore::Layout::BlockFormattingContext::layoutFormattingContextRoot const):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (237319 => 237320)


--- trunk/Source/WebCore/ChangeLog	2018-10-22 07:19:36 UTC (rev 237319)
+++ trunk/Source/WebCore/ChangeLog	2018-10-22 15:21:59 UTC (rev 237320)
@@ -1,3 +1,15 @@
+2018-10-22  Zalan Bujtas  <[email protected]>
+
+        [LFC][IFC] Block formatting context roots avoid floats.
+        https://bugs.webkit.org/show_bug.cgi?id=190723
+
+        Reviewed by Antti Koivisto.
+
+        Inline formatting context roots don't avoid floats (unless they also establish block formatting context).
+
+        * layout/blockformatting/BlockFormattingContext.cpp:
+        (WebCore::Layout::BlockFormattingContext::layoutFormattingContextRoot const):
+
 2018-10-20  YUHAN WU  <[email protected]>
 
         MediaRecorder should fire a stop event when all tracks are ended

Modified: trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp (237319 => 237320)


--- trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp	2018-10-22 07:19:36 UTC (rev 237319)
+++ trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp	2018-10-22 15:21:59 UTC (rev 237320)
@@ -148,7 +148,7 @@
     }
     else if (layoutBox.hasFloatClear())
         computeVerticalPositionForFloatClear(layoutContext, floatingContext, layoutBox);
-    else
+    else if (layoutBox.establishesBlockFormattingContext())
         computePositionToAvoidFloats(layoutContext, floatingContext, layoutBox);
 
     // Now that we computed the root's height, we can go back and layout the out-of-flow descedants (if any).
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to