Changeset 248365 in webkit

Timestamp:

Aug 7, 2019 8:32:55 AM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC] Rename FormattingContext::layoutOutOfFlowDescendants to layoutOutOfFlowContent
​https://bugs.webkit.org/show_bug.cgi?id=200502
<rdar://problem/54032534>

Reviewed by Antti Koivisto.

The layoutOutOfFlowDescendants name is not entirely accurate. In a formatting context we only
lay out the out-of-flow boxes that actually belong to the current formatting context.

<div style="float: left">

<div id=outer style="position: absolute">

<div id=inner style="position: absolute"></div>

</div>

</div>

The float's formatting context only lays out the outer absolutely positioned box. The inner box
(which is also an out-of-flow descendant of the float box) is taken care of by the outer box.

• layout/FormattingContext.cpp:

(WebCore::Layout::FormattingContext::layoutOutOfFlowContent const):
(WebCore::Layout::FormattingContext::validateGeometryConstraintsAfterLayout const):
(WebCore::Layout::FormattingContext::layoutOutOfFlowDescendants const): Deleted.

• layout/FormattingContext.h:
• layout/LayoutState.cpp:

(WebCore::Layout::LayoutState::layoutFormattingContextSubtree):

• layout/blockformatting/BlockFormattingContext.cpp:

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

• layout/inlineformatting/InlineFormattingContext.cpp:

(WebCore::Layout::InlineFormattingContext::layoutFormattingContextRoot const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/FormattingContext.cpp (modified) (3 diffs)
• layout/FormattingContext.h (modified) (1 diff)
• layout/LayoutState.cpp (modified) (1 diff)
• layout/blockformatting/BlockFormattingContext.cpp (modified) (1 diff)
• layout/inlineformatting/InlineFormattingContext.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-07  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC] Rename FormattingContext::layoutOutOfFlowDescendants to layoutOutOfFlowContent
+        https://bugs.webkit.org/show_bug.cgi?id=200502
+        <rdar://problem/54032534>
+
+        Reviewed by Antti Koivisto.
+
+        The layoutOutOfFlowDescendants name is not entirely accurate. In a formatting context we only
+        lay out the out-of-flow boxes that actually belong to the current formatting context.
+
+        <div style="float: left">
+          <div id=outer style="position: absolute">
+            <div id=inner style="position: absolute"></div>
+          </div>
+        </div>
+
+        The float's formatting context only lays out the outer absolutely positioned box. The inner box
+        (which is also an out-of-flow descendant of the float box) is taken care of by the outer box.
+
+        * layout/FormattingContext.cpp:
+        (WebCore::Layout::FormattingContext::layoutOutOfFlowContent const):
+        (WebCore::Layout::FormattingContext::validateGeometryConstraintsAfterLayout const):
+        (WebCore::Layout::FormattingContext::layoutOutOfFlowDescendants const): Deleted.
+        * layout/FormattingContext.h:
+        * layout/LayoutState.cpp:
+        (WebCore::Layout::LayoutState::layoutFormattingContextSubtree):
+        * layout/blockformatting/BlockFormattingContext.cpp:
+        (WebCore::Layout::BlockFormattingContext::layoutFormattingContextRoot const):
+        * layout/inlineformatting/InlineFormattingContext.cpp:
+        (WebCore::Layout::InlineFormattingContext::layoutFormattingContextRoot const):
+
 2019-08-07  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/layout/FormattingContext.cpp

@@ -134 +134 @@
 }
 
-void FormattingContext::layoutOutOfFlowDescendants() const
-{
-    LOG_WITH_STREAM(FormattingContextLayout, stream << "Start: layout out-of-flow descendants -> context: " << &layoutState() << " root: " << &root());
+void FormattingContext::layoutOutOfFlowContent() const
+{
+    LOG_WITH_STREAM(FormattingContextLayout, stream << "Start: layout out-of-flow content -> context: " << &layoutState() << " root: " << &root());
 
     for (auto& outOfFlowBox : formattingState().outOfFlowBoxes()) {
@@ -148 +148 @@
 
         computeOutOfFlowVerticalGeometry(*outOfFlowBox);
-        formattingContext->layoutOutOfFlowDescendants();
-    }
-    LOG_WITH_STREAM(FormattingContextLayout, stream << "End: layout out-of-flow descendants -> context: " << &layoutState() << " root: " << &root());
+        formattingContext->layoutOutOfFlowContent();
+    }
+    LOG_WITH_STREAM(FormattingContextLayout, stream << "End: layout out-of-flow content -> context: " << &layoutState() << " root: " << &root());
 }
 
@@ -240 +240 @@
             // margin-left + border-left-width + padding-left + width + padding-right + border-right-width + margin-right = width of containing block
             auto containingBlockWidth = containingBlockDisplayBox.contentBoxWidth();
-            ASSERT(displayBox.marginStart() + displayBox.borderLeft() + displayBox.paddingLeft().valueOr(0) + displayBox.contentBoxWidth()
-                + displayBox.paddingRight().valueOr(0) + displayBox.borderRight() + displayBox.marginEnd() == containingBlockWidth);
+            ASSERT(displayBox.horizontalMarginBorderAndPadding() + displayBox.contentBoxWidth() == containingBlockWidth);
         }
 

trunk/Source/WebCore/layout/FormattingContext.h

@@ -51 +51 @@
 
     virtual void layout() const = 0;
-    void layoutOutOfFlowDescendants() const;
+    void layoutOutOfFlowContent() const;
 
     struct IntrinsicWidthConstraints {

trunk/Source/WebCore/layout/LayoutState.cpp

@@ -86 +86 @@
     auto formattingContext = createFormattingContext(layoutRoot);
     formattingContext->layout();
-    formattingContext->layoutOutOfFlowDescendants();
+    formattingContext->layoutOutOfFlowContent();
 }
 

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

@@ -173 +173 @@
     LOG_WITH_STREAM(FormattingContextLayout, stream << "[Compute] -> [Height][Margin] -> for layoutBox(" << &layoutBox << ")");
     computeHeightAndMargin(layoutBox);
-    // Now that we computed the root's height, we can go back and layout the out-of-flow descedants (if any).
-    formattingContext->layoutOutOfFlowDescendants();
+    // Now that we computed the root's height, we can go back and layout the out-of-flow content.
+    formattingContext->layoutOutOfFlowContent();
 
     // Float related final positioning.

trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp

@@ -249 +249 @@
     // Come back and finalize the root's height and margin.
     computeHeightAndMargin(root);
-    // Now that we computed the root's height, we can go back and layout the out-of-flow descedants (if any).
-    formattingContext->layoutOutOfFlowDescendants();
+    // Now that we computed the root's height, we can go back and layout the out-of-flow content.
+    formattingContext->layoutOutOfFlowContent();
 }