Changeset 249439 in webkit

Timestamp:

Sep 3, 2019 12:53:49 PM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC] FloatingState should not need to query for display boxes.
​https://bugs.webkit.org/show_bug.cgi?id=201408
<rdar://problem/54958348>

Reviewed by Antti Koivisto.

This is in preparation for transitioning the floating codebase to use the formatting context for
retrieving display boxes.
FloatingContext should be responsible for adding/removing the new/existing float boxes to the state.

• layout/blockformatting/BlockFormattingContext.cpp:

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

• layout/floats/FloatingContext.cpp:

(WebCore::Layout::FloatingContext::append):
(WebCore::Layout::FloatingContext::remove):

• layout/floats/FloatingContext.h:
• layout/floats/FloatingState.cpp:

(WebCore::Layout::FloatingState::append):
(WebCore::Layout::belongsToThisFloatingContext): Deleted.

• layout/floats/FloatingState.h:

(WebCore::Layout::FloatingState::FloatItem::horizontalMargin const):

• layout/inlineformatting/InlineFormattingContextLineLayout.cpp:

(WebCore::Layout::InlineFormattingContext::InlineLayout::createDisplayRuns const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/blockformatting/BlockFormattingContext.cpp (modified) (1 diff)
• layout/floats/FloatingContext.cpp (modified) (1 diff)
• layout/floats/FloatingContext.h (modified) (1 diff)
• layout/floats/FloatingState.cpp (modified) (3 diffs)
• layout/floats/FloatingState.h (modified) (4 diffs)
• layout/inlineformatting/InlineFormattingContextLineLayout.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-09-03  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC] FloatingState should not need to query for display boxes.
+        https://bugs.webkit.org/show_bug.cgi?id=201408
+        <rdar://problem/54958348>
+
+        Reviewed by Antti Koivisto.
+
+        This is in preparation for transitioning the floating codebase to use the formatting context for
+        retrieving display boxes.
+        FloatingContext should be responsible for adding/removing the new/existing float boxes to the state.
+
+        * layout/blockformatting/BlockFormattingContext.cpp:
+        (WebCore::Layout::BlockFormattingContext::layoutFormattingContextRoot):
+        * layout/floats/FloatingContext.cpp:
+        (WebCore::Layout::FloatingContext::append):
+        (WebCore::Layout::FloatingContext::remove):
+        * layout/floats/FloatingContext.h:
+        * layout/floats/FloatingState.cpp:
+        (WebCore::Layout::FloatingState::append):
+        (WebCore::Layout::belongsToThisFloatingContext): Deleted.
+        * layout/floats/FloatingState.h:
+        (WebCore::Layout::FloatingState::FloatItem::horizontalMargin const):
+        * layout/inlineformatting/InlineFormattingContextLineLayout.cpp:
+        (WebCore::Layout::InlineFormattingContext::InlineLayout::createDisplayRuns const):
+
 2019-09-03  Zalan Bujtas  <zalan@apple.com>
 

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

@@ -181 +181 @@
     if (layoutBox.isFloatingPositioned()) {
         computeFloatingPosition(floatingContext, layoutBox);
-        floatingContext.floatingState().append(layoutBox);
+        floatingContext.append(layoutBox);
     } else if (layoutBox.establishesBlockFormattingContext())
         computePositionToAvoidFloats(floatingContext, layoutBox);

trunk/Source/WebCore/layout/floats/FloatingContext.cpp

@@ -342 +342 @@
 }
 
+void FloatingContext::append(const Box& floatBox)
+{
+    floatingState().append(FloatingState::FloatItem { floatBox, FormattingContext::mapBoxToAncestor(layoutState(), floatBox, downcast<Container>(floatingState().root())) });
+}
+
+void FloatingContext::remove(const Box& floatBox)
+{
+    floatingState().remove(floatBox);
+}
+
 static FloatPair::LeftRightIndex findAvailablePosition(FloatAvoider& floatAvoider, const FloatingState::FloatList& floats)
 {

trunk/Source/WebCore/layout/floats/FloatingContext.h

@@ -67 +67 @@
     };
     Constraints constraints(PositionInContextRoot verticalPosition) const;
+    void append(const Box&);
+    void remove(const Box&);
 
 private:

trunk/Source/WebCore/layout/floats/FloatingState.cpp

@@ -52 +52 @@
 }
 
-#ifndef NDEBUG
-static bool belongsToThisFloatingContext(const Box& layoutBox, const Box& floatingStateRoot)
-{
-    auto& formattingContextRoot = layoutBox.formattingContextRoot();
-    if (&formattingContextRoot == &floatingStateRoot)
-        return true;
-
-    // Maybe the layout box belongs to an inline formatting context that inherits the floating state from the parent (block) formatting context. 
-    if (!formattingContextRoot.establishesInlineFormattingContext())
-        return false;
-
-    return &formattingContextRoot.formattingContextRoot() == &floatingStateRoot;
-}
-#endif
-
 void FloatingState::remove(const Box& layoutBox)
 {
@@ -78 +63 @@
 }
 
-void FloatingState::append(const Box& layoutBox)
+void FloatingState::append(FloatItem floatItem)
 {
     ASSERT(is<Container>(*m_formattingContextRoot));
-    ASSERT(belongsToThisFloatingContext(layoutBox, *m_formattingContextRoot));
-    ASSERT(is<Container>(*m_formattingContextRoot));
 
-    auto newFloatItem = FloatItem { layoutBox, FormattingContext::mapBoxToAncestor(layoutState(), layoutBox, downcast<Container>(root()))};
     if (m_floats.isEmpty())
-        return m_floats.append(newFloatItem);
+        return m_floats.append(floatItem);
 
-    auto& displayBox = m_layoutState.displayBoxForLayoutBox(layoutBox);
-    auto isLeftPositioned = layoutBox.isLeftFloatingPositioned();
+    auto isLeftPositioned = floatItem.isLeftPositioned();
     // When adding a new float item to the list, we have to ensure that it is definitely the left(right)-most item.
     // Normally it is, but negative horizontal margins can push the float box beyond another float box.
     // Float items in m_floats list should stay in horizontal position order (left/right edge) on the same vertical position.
-    auto hasNegativeHorizontalMargin = (isLeftPositioned && displayBox.marginStart() < 0) || (!isLeftPositioned && displayBox.marginEnd() < 0);
+    auto horizontalMargin = floatItem.horizontalMargin();
+    auto hasNegativeHorizontalMargin = (isLeftPositioned && horizontalMargin.start < 0) || (!isLeftPositioned && horizontalMargin.end < 0);
     if (!hasNegativeHorizontalMargin)
-        return m_floats.append(newFloatItem);
+        return m_floats.append(floatItem);
 
     for (int i = m_floats.size() - 1; i >= 0; --i) {
@@ -101 +83 @@
         if (isLeftPositioned != floatItem.isLeftPositioned())
             continue;
-        if (newFloatItem.rectWithMargin().top() < floatItem.rectWithMargin().bottom())
+        if (floatItem.rectWithMargin().top() < floatItem.rectWithMargin().bottom())
             continue;
-        if ((isLeftPositioned && newFloatItem.rectWithMargin().right() >= floatItem.rectWithMargin().right())
-            || (!isLeftPositioned && newFloatItem.rectWithMargin().left() <= floatItem.rectWithMargin().left()))
-            return m_floats.insert(i + 1, newFloatItem);
+        if ((isLeftPositioned && floatItem.rectWithMargin().right() >= floatItem.rectWithMargin().right())
+            || (!isLeftPositioned && floatItem.rectWithMargin().left() <= floatItem.rectWithMargin().left()))
+            return m_floats.insert(i + 1, floatItem);
     }
-    return m_floats.insert(0, newFloatItem);
+    return m_floats.insert(0, floatItem);
 }
 

trunk/Source/WebCore/layout/floats/FloatingState.h

@@ -39 +39 @@
 namespace Layout {
 
+class FloatingContext;
 class FormattingState;
 class LayoutState;
@@ -47 +48 @@
 public:
     static Ref<FloatingState> create(LayoutState& layoutState, const Box& formattingContextRoot) { return adoptRef(*new FloatingState(layoutState, formattingContextRoot)); }
-
-    void append(const Box& layoutBox);
-    void remove(const Box& layoutBox);
 
     const Box& root() const { return *m_formattingContextRoot; }
@@ -68 +66 @@
 
         Display::Rect rectWithMargin() const { return m_absoluteDisplayBox.rectWithMargin(); }
+        UsedHorizontalMargin horizontalMargin() const { return m_absoluteDisplayBox.horizontalMargin(); }
         PositionInContextRoot bottom() const { return { m_absoluteDisplayBox.bottom() }; }
 
@@ -81 +80 @@
     friend class FloatingContext;
     FloatingState(LayoutState&, const Box& formattingContextRoot);
+
+    void append(FloatItem);
+    void remove(const Box& layoutBox);
 
     LayoutState& layoutState() const { return m_layoutState; }

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

@@ -365 +365 @@
     auto& formattingContext = this->formattingContext();
     auto& formattingState = downcast<InlineFormattingState>(layoutState.establishedFormattingState(formattingRoot()));
-    auto& floatingState = formattingState.floatingState();
-    auto floatingContext = FloatingContext { formattingRoot(), floatingState };
+    auto floatingContext = FloatingContext { formattingRoot(), formattingState.floatingState() };
 
     // Move floats to their final position.
@@ -377 +376 @@
         // Float it.
         displayBox.setTopLeft(floatingContext.positionForFloat(floatBox));
-        floatingState.append(floatBox);
+        floatingContext.append(floatBox);
     }