Changeset 232152 in webkit

Timestamp:

May 24, 2018, 8:01:11 AM (8 years ago)

Author:

Alan Bujtas

Message:

[LFC] Implement FormattingContext::placeInFlowPositionedChildren
​https://bugs.webkit.org/show_bug.cgi?id=185934

Reviewed by Antti Koivisto.

• layout/FormattingContext.cpp:

(WebCore::Layout::FormattingContext::computeInFlowPositionedPosition const):
(WebCore::Layout::FormattingContext::placeInFlowPositionedChildren const):

• layout/FormattingContext.h:
• layout/blockformatting/BlockFormattingContext.cpp:

(WebCore::Layout::BlockFormattingContext::layout const):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-05-24  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC] Implement FormattingContext::placeInFlowPositionedChildren
+        https://bugs.webkit.org/show_bug.cgi?id=185934
+
+        Reviewed by Antti Koivisto.
+
+        * layout/FormattingContext.cpp:
+        (WebCore::Layout::FormattingContext::computeInFlowPositionedPosition const):
+        (WebCore::Layout::FormattingContext::placeInFlowPositionedChildren const):
+        * layout/FormattingContext.h:
+        * layout/blockformatting/BlockFormattingContext.cpp:
+        (WebCore::Layout::BlockFormattingContext::layout const):
+
 2018-05-23  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebCore/layout/FormattingContext.cpp

@@ -54 +54 @@
 }
 
-void FormattingContext::computeInFlowPositionedPosition(const Box&, Display::Box&) const
+void FormattingContext::computeInFlowPositionedPosition(LayoutContext&, const Box&, Display::Box&) const
 {
 }
@@ -156 +156 @@
 }
 
-void FormattingContext::placeInFlowPositionedChildren(const Container&) const
-{
+void FormattingContext::placeInFlowPositionedChildren(LayoutContext& layoutContext, const Container& container) const
+{
+    // If this container also establishes a formatting context, then positioning already has happend in that the formatting context.
+    if (container.establishesFormattingContext() && &container != &root())
+        return;
+
+    for (auto& layoutBox : childrenOfType<Box>(container)) {
+        if (!layoutBox.isInFlowPositioned())
+            continue;
+        computeInFlowPositionedPosition(layoutContext, layoutBox, *layoutContext.displayBoxForLayoutBox(layoutBox));
+    }
 }
 

trunk/Source/WebCore/layout/FormattingContext.h

@@ -68 +68 @@
 
     virtual void computeStaticPosition(LayoutContext&, const Box&, Display::Box&) const;
-    virtual void computeInFlowPositionedPosition(const Box&, Display::Box&) const;
+    virtual void computeInFlowPositionedPosition(LayoutContext&, const Box&, Display::Box&) const;
     virtual void computeOutOfFlowPosition(LayoutContext&, const Box&, Display::Box&) const;
 
@@ -87 +87 @@
     virtual LayoutUnit marginRight(const Box&) const;
 
-    void placeInFlowPositionedChildren(const Container&) const;
+    void placeInFlowPositionedChildren(LayoutContext&, const Container&) const;
     void layoutOutOfFlowDescendants(LayoutContext&s) const;
 

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

@@ -102 +102 @@
             auto& container = downcast<Container>(layoutBox);
             // Move in-flow positioned children to their final position.
-            placeInFlowPositionedChildren(container);
+            placeInFlowPositionedChildren(layoutContext, container);
             if (auto* nextSibling = container.nextInFlowOrFloatingSibling()) {
                 layoutQueue.append(std::make_unique<LayoutPair>(LayoutPair {*nextSibling, layoutContext.createDisplayBox(*nextSibling)}));
@@ -110 +110 @@
     }
     // Place the inflow positioned children.
-    placeInFlowPositionedChildren(formattingRoot);
+    placeInFlowPositionedChildren(layoutContext, formattingRoot);
     // And take care of out-of-flow boxes as the final step.
     layoutOutOfFlowDescendants(layoutContext);