Changeset 249292 in webkit

Timestamp:

Aug 29, 2019, 2:26:23 PM (7 years ago)

Author:

Alan Bujtas

Message:

[LFC][BFC] BlockFormattingContext::usedAvailableWidthForFloatAvoider should only be called on float avoiders.
​https://bugs.webkit.org/show_bug.cgi?id=201238
<rdar://problem/54807663>

Reviewed by Antti Koivisto.

Make the horizontal available space logic for float avoiders more explicit/readable.

• layout/blockformatting/BlockFormattingContext.cpp:

(WebCore::Layout::BlockFormattingContext::usedAvailableWidthForFloatAvoider const):
(WebCore::Layout::BlockFormattingContext::layoutFormattingContextRoot const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/blockformatting/BlockFormattingContext.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-29  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][BFC] BlockFormattingContext::usedAvailableWidthForFloatAvoider should only be called on float avoiders.
+        https://bugs.webkit.org/show_bug.cgi?id=201238
+        <rdar://problem/54807663>
+
+        Reviewed by Antti Koivisto.
+
+        Make the horizontal available space logic for float avoiders more explicit/readable. 
+
+        * layout/blockformatting/BlockFormattingContext.cpp:
+        (WebCore::Layout::BlockFormattingContext::usedAvailableWidthForFloatAvoider const):
+        (WebCore::Layout::BlockFormattingContext::layoutFormattingContextRoot const):
+
 2019-08-29  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp

@@ -123 +123 @@
     // Normally the available width for an in-flow block level box is the width of the containing block's content box.
     // However (and can't find it anywhere in the spec) non-floating positioned float avoider block level boxes are constrained by existing floats.
-    if (!layoutBox.isFloatAvoider() || layoutBox.isFloatingPositioned())
-        return { };
+    ASSERT(layoutBox.isFloatAvoider());
     auto& floatingState = floatingContext.floatingState();
     if (floatingState.isEmpty())
@@ -164 +163 @@
     computeStaticVerticalPosition(floatingContext, layoutBox);
 
-    computeWidthAndMargin(layoutBox, usedAvailableWidthForFloatAvoider(floatingContext, layoutBox));
+    Optional<LayoutUnit> usedAvailableWidthForFloatAvoider;
+    auto horizontalAvailableSpaceIsConstrainedByExistingFloats = layoutBox.isFloatAvoider() && !layoutBox.isFloatingPositioned();
+    if (horizontalAvailableSpaceIsConstrainedByExistingFloats)
+        usedAvailableWidthForFloatAvoider = this->usedAvailableWidthForFloatAvoider(floatingContext, layoutBox);
+    computeWidthAndMargin(layoutBox, usedAvailableWidthForFloatAvoider);
     computeStaticHorizontalPosition(layoutBox);
     // Swich over to the new formatting context (the one that the root creates).