Changeset 267557 in webkit

Timestamp:

Sep 24, 2020, 9:49:46 PM (6 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Add helper functions to create LineBox::InlineBox objects for inline level boxes.
​https://bugs.webkit.org/show_bug.cgi?id=216957

Reviewed by Simon Fraser.

The overloaded LineBox::InlineBox constructors were representing different types of inline level boxes.
These new helper functions make it easier to figure out how to initiate LineBox::InlineBox objects depending on the type of
the inline level box.
This patch also removes an incorrect ASSERT on the inline box's height. It is okay to have a zero height inline box.

• layout/inlineformatting/InlineFormattingContextGeometry.cpp:

(WebCore::Layout::LineBoxBuilder::constructInlineBoxes):

• layout/inlineformatting/InlineLineBox.cpp:

(WebCore::Layout::LineBox::InlineBox::InlineBox):
(WebCore::Layout::m_baseline):

• layout/inlineformatting/InlineLineBox.h:

(WebCore::Layout::LineBox::InlineBox::createBoxForRootInlineBox):
(WebCore::Layout::LineBox::InlineBox::createBoxForAtomicInlineLevelBox):
(WebCore::Layout::LineBox::InlineBox::createBoxForInlineBox):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/inlineformatting/InlineFormattingContextGeometry.cpp (modified) (4 diffs)
• layout/inlineformatting/InlineLineBox.cpp (modified) (1 diff)
• layout/inlineformatting/InlineLineBox.h (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-09-24  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Add helper functions to create LineBox::InlineBox objects for inline level boxes.
+        https://bugs.webkit.org/show_bug.cgi?id=216957
+
+        Reviewed by Simon Fraser.
+
+        The overloaded LineBox::InlineBox constructors were representing different types of inline level boxes.
+        These new helper functions make it easier to figure out how to initiate LineBox::InlineBox objects depending on the type of
+        the inline level box.
+        This patch also removes an incorrect ASSERT on the inline box's height. It is okay to have a zero height inline box.  
+
+        * layout/inlineformatting/InlineFormattingContextGeometry.cpp:
+        (WebCore::Layout::LineBoxBuilder::constructInlineBoxes):
+        * layout/inlineformatting/InlineLineBox.cpp:
+        (WebCore::Layout::LineBox::InlineBox::InlineBox):
+        (WebCore::Layout::m_baseline):
+        * layout/inlineformatting/InlineLineBox.h:
+        (WebCore::Layout::LineBox::InlineBox::createBoxForRootInlineBox):
+        (WebCore::Layout::LineBox::InlineBox::createBoxForAtomicInlineLevelBox):
+        (WebCore::Layout::LineBox::InlineBox::createBoxForInlineBox):
+
 2020-09-24  Keith Miller  <keith_miller@apple.com>
 

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

@@ -180 +180 @@
             inlineBox.setLineSpacing(lineSpacing);
     };
-
+    auto horizontalAligmentOffset = lineBox.horizontalAlignmentOffset().valueOr(InlineLayoutUnit { });
     auto constructRootInlineBox = [&] {
-        auto rootInlineBox = makeUnique<LineBox::InlineBox>(rootBox(), lineBox.horizontalAlignmentOffset().valueOr(InlineLayoutUnit { }), lineBox.logicalWidth());
+        auto rootInlineBox = LineBox::InlineBox::createBoxForRootInlineBox(rootBox(), horizontalAligmentOffset, lineBox.logicalWidth());
 
         auto lineHasImaginaryStrut = !layoutState().inQuirksMode();
@@ -216 +216 @@
             // Construct the missing LineBox::InlineBoxes starting with the topmost ancestor.
             for (auto* ancestor : WTF::makeReversedRange(ancestorsWithoutInlineBoxes)) {
-                auto inlineBox = makeUnique<LineBox::InlineBox>(*ancestor, lineBox.horizontalAlignmentOffset().valueOr(InlineLayoutUnit { }), lineBox.logicalWidth());
+                auto inlineBox = LineBox::InlineBox::createBoxForInlineBox(*ancestor, horizontalAligmentOffset, lineBox.logicalWidth());
                 inlineBox->setIsNonEmpty();
                 adjustVerticalGeometryForNonEmptyInlineBox(*inlineBox);
@@ -227 +227 @@
         auto& inlineLevelBox = run.layoutBox();
         if (run.isBox()) {
-            auto logicalLeft = lineBox.horizontalAlignmentOffset().valueOr(InlineLayoutUnit { }) + run.logicalLeft();
+            auto logicalLeft = horizontalAligmentOffset + run.logicalLeft();
             auto& inlineLevelBoxGeometry = formattingContext().geometryForBox(inlineLevelBox);
             auto logicalHeight = inlineLevelBoxGeometry.marginBoxHeight();
@@ -249 +249 @@
                 baseline = inlineLevelBoxGeometry.marginBefore() + inlineLevelBoxGeometry.borderTop() + inlineLevelBoxGeometry.paddingTop().valueOr(0) + inlineBlockBaseline;
             }
-            auto rect = InlineRect { { }, logicalLeft, run.logicalWidth(), logicalHeight };
-            lineBox.addInlineBox(makeUnique<LineBox::InlineBox>(inlineLevelBox, rect, baseline));
+            auto inlineBox = LineBox::InlineBox::createBoxForAtomicInlineLevelBox(inlineLevelBox, logicalLeft, { run.logicalWidth(), logicalHeight }, baseline);
+            if (logicalHeight)
+                inlineBox->setIsNonEmpty();
+            lineBox.addInlineBox(WTFMove(inlineBox));
         } else if (run.isContainerStart()) {
-            auto logicalLeft = lineBox.horizontalAlignmentOffset().valueOr(InlineLayoutUnit { }) + run.logicalLeft();
+            auto logicalLeft = horizontalAligmentOffset + run.logicalLeft();
             auto initialLogicalWidth = lineBox.logicalWidth() - run.logicalLeft();
             ASSERT(initialLogicalWidth >= 0);
-            lineBox.addInlineBox(makeUnique<LineBox::InlineBox>(inlineLevelBox, logicalLeft, initialLogicalWidth));
+            lineBox.addInlineBox(LineBox::InlineBox::createBoxForInlineBox(inlineLevelBox, logicalLeft, initialLogicalWidth));
         } else if (run.isContainerEnd()) {
             // Adjust the logical width when the inline level container closes on this line.

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

@@ -33 +33 @@
 namespace Layout {
 
-LineBox::InlineBox::InlineBox(const Box& layoutBox, const InlineRect& rect, InlineLayoutUnit baseline)
+LineBox::InlineBox::InlineBox(const Box& layoutBox, InlineLayoutUnit logicalLeft, InlineLayoutSize logicalSize, InlineLayoutUnit baseline)
     : m_layoutBox(makeWeakPtr(layoutBox))
-    , m_logicalRect(rect)
+    , m_logicalRect({ }, logicalLeft, logicalSize.width(), logicalSize.height())
     , m_baseline(baseline)
-    , m_isEmpty(false)
 {
-    ASSERT(rect.height());
 }
 

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

@@ -58 +58 @@
     WTF_MAKE_FAST_ALLOCATED;
 public:
+    // FIXME: This name is in conflict with the actual inline box term: inline level box whose contents participate in this IFC.
+    // This class represents a rectangle on the line (initiated by an inline level box) with some additional attributes like baseline, descent etc.
     struct InlineBox {
         WTF_MAKE_ISO_ALLOCATED_INLINE(InlineBox);
     public:
-        InlineBox(const Box&, const InlineRect&, InlineLayoutUnit baseline);
-        InlineBox(const Box&, InlineLayoutUnit logicalLeft, InlineLayoutUnit logicalWidth);
-        InlineBox() = default;
+        static std::unique_ptr<LineBox::InlineBox> createBoxForRootInlineBox(const Box&, InlineLayoutUnit logicalLeft, InlineLayoutUnit logicalWidth);
+        static std::unique_ptr<LineBox::InlineBox> createBoxForAtomicInlineLevelBox(const Box&, InlineLayoutUnit logicalLeft, InlineLayoutSize, InlineLayoutUnit baseline);
+        static std::unique_ptr<LineBox::InlineBox> createBoxForInlineBox(const Box&, InlineLayoutUnit logicalLeft, InlineLayoutUnit logicalWidth);
 
         const InlineRect& logicalRect() const { return m_logicalRect; }
@@ -82 +84 @@
         const Box& layoutBox() const { return *m_layoutBox; }
 
+        InlineBox(const Box&, InlineLayoutUnit logicalLeft, InlineLayoutSize, InlineLayoutUnit baseline);
+        InlineBox(const Box&, InlineLayoutUnit logicalLeft, InlineLayoutUnit logicalWidth);
+        InlineBox() = default;
+
     private:
         friend class LineBoxBuilder;
@@ -92 +98 @@
         void setLineSpacing(InlineLayoutUnit lineSpacing) { m_lineSpacing = lineSpacing; }
 
+    private:
         WeakPtr<const Box> m_layoutBox;
         InlineRect m_logicalRect;
@@ -143 +150 @@
 };
 
+inline std::unique_ptr<LineBox::InlineBox> LineBox::InlineBox::createBoxForRootInlineBox(const Box& layoutBox, InlineLayoutUnit logicalLeft, InlineLayoutUnit logicalWidth)
+{
+    return makeUnique<LineBox::InlineBox>(layoutBox, logicalLeft, logicalWidth);
+}
+
+inline std::unique_ptr<LineBox::InlineBox> LineBox::InlineBox::createBoxForAtomicInlineLevelBox(const Box& layoutBox, InlineLayoutUnit logicalLeft, InlineLayoutSize logicalSize, InlineLayoutUnit baseline)
+{
+    return makeUnique<LineBox::InlineBox>(layoutBox, logicalLeft, logicalSize, baseline);
+}
+
+inline std::unique_ptr<LineBox::InlineBox> LineBox::InlineBox::createBoxForInlineBox(const Box& layoutBox, InlineLayoutUnit logicalLeft, InlineLayoutUnit logicalWidth)
+{
+    return makeUnique<LineBox::InlineBox>(layoutBox, logicalLeft, logicalWidth);
+}
+
 }
 }