Changeset 237454 in webkit

Timestamp:

Oct 26, 2018, 7:36:30 AM (8 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Compute float box size and position
​https://bugs.webkit.org/show_bug.cgi?id=190938

Reviewed by Antti Koivisto.

• layout/inlineformatting/InlineFormattingContext.cpp:

(WebCore::Layout::InlineFormattingContext::computeWidthAndHeight const):
(WebCore::Layout::InlineFormattingContext::computeFloatPosition const):

• layout/inlineformatting/InlineFormattingContext.h:

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-10-26  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Compute float box size and position
+        https://bugs.webkit.org/show_bug.cgi?id=190938
+
+        Reviewed by Antti Koivisto.
+
+        * layout/inlineformatting/InlineFormattingContext.cpp:
+        (WebCore::Layout::InlineFormattingContext::computeWidthAndHeight const):
+        (WebCore::Layout::InlineFormattingContext::computeFloatPosition const):
+        * layout/inlineformatting/InlineFormattingContext.h:
+
 2018-10-26  Zalan Bujtas  <zalan@apple.com>
 

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

@@ -160 +160 @@
 }
 
-void InlineFormattingContext::computeWidthAndHeight(const LayoutContext& layoutContext, const Box& layoutBox) const
+void InlineFormattingContext::computeWidthAndHeight(LayoutContext& layoutContext, const Box& layoutBox) const
 {
     if (is<InlineBox>(layoutBox) && downcast<InlineBox>(layoutBox).hasTextContent()) {
@@ -168 +168 @@
     }
 
-    if (layoutBox.isFloatingPositioned()) {
-        ASSERT_NOT_IMPLEMENTED_YET();
-        return;
-    }
-
     if (layoutBox.isInlineBlockBox()) {
         ASSERT_NOT_IMPLEMENTED_YET();
@@ -178 +173 @@
     }
 
-    if (layoutBox.replaced()) {
-        computeBorderAndPadding(layoutContext, layoutBox);
-
-        auto& displayBox = layoutContext.displayBoxForLayoutBox(layoutBox);
-
-        auto widthAndMargin = Geometry::inlineReplacedWidthAndMargin(layoutContext, layoutBox);
-        displayBox.setContentBoxWidth(widthAndMargin.width);
-        displayBox.setHorizontalMargin(widthAndMargin.margin);
-        displayBox.setHorizontalNonComputedMargin(widthAndMargin.nonComputedMargin);
-
-        auto heightAndMargin = Geometry::inlineReplacedHeightAndMargin(layoutContext, layoutBox);
-        displayBox.setContentBoxHeight(heightAndMargin.height);
-        displayBox.setVerticalNonCollapsedMargin(heightAndMargin.margin);
-        displayBox.setVerticalMargin(heightAndMargin.collapsedMargin.value_or(heightAndMargin.margin));
-        return;
-    }
-
-    ASSERT_NOT_REACHED();
+    computeBorderAndPadding(layoutContext, layoutBox);
+
+    WidthAndMargin widthAndMargin;
+    HeightAndMargin heightAndMargin;
+
+    if (layoutBox.isFloatingPositioned()) {
+        widthAndMargin = Geometry::floatingWidthAndMargin(layoutContext, *this, layoutBox);
+        heightAndMargin = Geometry::floatingHeightAndMargin(layoutContext, layoutBox);
+    } else if (layoutBox.replaced()) {
+        widthAndMargin = Geometry::inlineReplacedWidthAndMargin(layoutContext, layoutBox);
+        heightAndMargin = Geometry::inlineReplacedHeightAndMargin(layoutContext, layoutBox);
+    } else
+        ASSERT_NOT_REACHED();
+
+    auto& displayBox = layoutContext.displayBoxForLayoutBox(layoutBox);
+    displayBox.setContentBoxWidth(widthAndMargin.width);
+    displayBox.setHorizontalMargin(widthAndMargin.margin);
+    displayBox.setHorizontalNonComputedMargin(widthAndMargin.nonComputedMargin);
+
+    displayBox.setContentBoxHeight(heightAndMargin.height);
+    displayBox.setVerticalNonCollapsedMargin(heightAndMargin.margin);
+    displayBox.setVerticalMargin(heightAndMargin.collapsedMargin.value_or(heightAndMargin.margin));
     return;
 }
 
+void InlineFormattingContext::computeFloatPosition(const LayoutContext& layoutContext, const FloatingContext& floatingContext, Line& line, const Box& floatBox) const
+{
+    ASSERT(layoutContext.hasDisplayBox(floatBox));
+    auto& displayBox = layoutContext.displayBoxForLayoutBox(floatBox);
+
+    // Set static position first.
+    displayBox.setTopLeft({ line.contentLogicalRight(), line.logicalTop() });
+    // Float it.
+    displayBox.setTopLeft(floatingContext.positionForFloat(floatBox));
+}
+
 void InlineFormattingContext::computeStaticPosition(const LayoutContext&, const Box&) const
 {

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

@@ -93 +93 @@
     void initializeNewLine(const LayoutContext&, Line&) const;
 
-    void computeWidthAndHeight(const LayoutContext&, const Box&) const;
+    void computeWidthAndHeight(LayoutContext&, const Box&) const;
+    void computeFloatPosition(const LayoutContext&, const FloatingContext&, Line&, const Box&) const;
     void computeStaticPosition(const LayoutContext&, const Box&) const override;
     void computeInFlowPositionedPosition(const LayoutContext&, const Box&) const override;