Title: [256154] releases/WebKitGTK/webkit-2.28/Source/WebCore
- Revision
- 256154
- Author
- carlo...@webkit.org
- Date
- 2020-02-10 05:26:37 -0800 (Mon, 10 Feb 2020)
Log Message
Merge r256097 - [LFC][BFC] Adjust Box::isFloatAvoider() for Inline and Independent FCs.
https://bugs.webkit.org/show_bug.cgi?id=207430
<rdar://problem/59288236>
Reviewed by Antti Koivisto.
A block container box that establishes both BFC and IFC is not a float avoider (add support for independent formatting context too).
* layout/layouttree/LayoutBox.cpp:
(WebCore::Layout::Box::isFloatAvoider const):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.28/Source/WebCore/ChangeLog (256153 => 256154)
--- releases/WebKitGTK/webkit-2.28/Source/WebCore/ChangeLog 2020-02-10 13:26:33 UTC (rev 256153)
+++ releases/WebKitGTK/webkit-2.28/Source/WebCore/ChangeLog 2020-02-10 13:26:37 UTC (rev 256154)
@@ -1,3 +1,16 @@
+2020-02-08 Zalan Bujtas <za...@apple.com>
+
+ [LFC][BFC] Adjust Box::isFloatAvoider() for Inline and Independent FCs.
+ https://bugs.webkit.org/show_bug.cgi?id=207430
+ <rdar://problem/59288236>
+
+ Reviewed by Antti Koivisto.
+
+ A block container box that establishes both BFC and IFC is not a float avoider (add support for independent formatting context too).
+
+ * layout/layouttree/LayoutBox.cpp:
+ (WebCore::Layout::Box::isFloatAvoider const):
+
2020-02-08 Simon Fraser <simon.fra...@apple.com>
Extent of a composited animation should not include the untransformed position
Modified: releases/WebKitGTK/webkit-2.28/Source/WebCore/layout/layouttree/LayoutBox.cpp (256153 => 256154)
--- releases/WebKitGTK/webkit-2.28/Source/WebCore/layout/layouttree/LayoutBox.cpp 2020-02-10 13:26:33 UTC (rev 256153)
+++ releases/WebKitGTK/webkit-2.28/Source/WebCore/layout/layouttree/LayoutBox.cpp 2020-02-10 13:26:37 UTC (rev 256154)
@@ -194,7 +194,8 @@
bool Box::isFloatAvoider() const
{
- return establishesBlockFormattingContext() || establishesTableFormattingContext() || hasFloatClear();
+ return (establishesBlockFormattingContext() && !establishesInlineFormattingContext())
+ || establishesTableFormattingContext() || establishesIndependentFormattingContext() || hasFloatClear();
}
const Container* Box::containingBlock() const
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
