Changeset 267657 in webkit

Timestamp:

Sep 27, 2020, 6:03:29 AM (6 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Create inline boxes for hard line breaks(<br>) and word wrap opportunities (<wbr>)
​https://bugs.webkit.org/show_bug.cgi?id=217023

Reviewed by Antti Koivisto.

Source/WebCore:

Both hard <br> and the word break opportunity layout boxes generate inline boxes and get computed box geometries.
It enables us to answer questions like element.offsetTop/offsetLeft.

Test: fast/layoutformattingcontext/br-and-wbr-simple.html

• layout/FormattingState.cpp:

(WebCore::Layout::FormattingState::boxGeometry):

• layout/Verification.cpp:

(WebCore::Layout::LayoutContext::verifyAndOutputMismatchingLayoutTree):

• layout/inlineformatting/InlineFormattingContext.cpp:

(WebCore::Layout::InlineFormattingContext::layoutInFlowContent):
(WebCore::Layout::InlineFormattingContext::computedIntrinsicWidthConstraints):
(WebCore::Layout::InlineFormattingContext::computeGeometryForLineContent):

• layout/inlineformatting/InlineFormattingContextGeometry.cpp:

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

• layout/inlineformatting/InlineLine.h:

(WebCore::Layout::Line::Run::isLineBreak const):
(WebCore::Layout::Line::Run::isSoftLineBreak const):
(WebCore::Layout::Line::Run::isHardLineBreak const):

• layout/tableformatting/TableFormattingContext.cpp:

(WebCore::Layout::TableFormattingContext::setUsedGeometryForCells):

LayoutTests:

• fast/layoutformattingcontext/br-and-wbr-simple-expected.html: Added.
• fast/layoutformattingcontext/br-and-wbr-simple.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/layoutformattingcontext/br-and-wbr-simple-expected.html (added)
• LayoutTests/fast/layoutformattingcontext/br-and-wbr-simple.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/layout/FormattingState.cpp (modified) (1 diff)
• Source/WebCore/layout/Verification.cpp (modified) (1 diff)
• Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp (modified) (4 diffs)
• Source/WebCore/layout/inlineformatting/InlineFormattingContextGeometry.cpp (modified) (4 diffs)
• Source/WebCore/layout/inlineformatting/InlineLine.h (modified) (1 diff)
• Source/WebCore/layout/tableformatting/TableFormattingContext.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-09-27  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Create inline boxes for hard line breaks(<br>) and word wrap opportunities (<wbr>)
+        https://bugs.webkit.org/show_bug.cgi?id=217023
+
+        Reviewed by Antti Koivisto.
+
+        * fast/layoutformattingcontext/br-and-wbr-simple-expected.html: Added.
+        * fast/layoutformattingcontext/br-and-wbr-simple.html: Added.
+
 2020-09-27  Rob Buis  <rbuis@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-09-27  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Create inline boxes for hard line breaks(<br>) and word wrap opportunities (<wbr>)
+        https://bugs.webkit.org/show_bug.cgi?id=217023
+
+        Reviewed by Antti Koivisto.
+
+        Both hard <br> and the word break opportunity layout boxes generate inline boxes and get computed box geometries.
+        It enables us to answer questions like element.offsetTop/offsetLeft.
+
+        Test: fast/layoutformattingcontext/br-and-wbr-simple.html
+
+        * layout/FormattingState.cpp:
+        (WebCore::Layout::FormattingState::boxGeometry):
+        * layout/Verification.cpp:
+        (WebCore::Layout::LayoutContext::verifyAndOutputMismatchingLayoutTree):
+        * layout/inlineformatting/InlineFormattingContext.cpp:
+        (WebCore::Layout::InlineFormattingContext::layoutInFlowContent):
+        (WebCore::Layout::InlineFormattingContext::computedIntrinsicWidthConstraints):
+        (WebCore::Layout::InlineFormattingContext::computeGeometryForLineContent):
+        * layout/inlineformatting/InlineFormattingContextGeometry.cpp:
+        (WebCore::Layout::LineBoxBuilder::constructInlineBoxes):
+        * layout/inlineformatting/InlineLine.h:
+        (WebCore::Layout::Line::Run::isLineBreak const):
+        (WebCore::Layout::Line::Run::isSoftLineBreak const):
+        (WebCore::Layout::Line::Run::isHardLineBreak const):
+        * layout/tableformatting/TableFormattingContext.cpp:
+        (WebCore::Layout::TableFormattingContext::setUsedGeometryForCells):
+
 2020-09-27  Rob Buis  <rbuis@igalia.com>
 

trunk/Source/WebCore/layout/FormattingState.cpp

@@ -53 +53 @@
     // Should never need to mutate a display box outside of the formatting context.
     ASSERT(&layoutState().establishedFormattingState(layoutBox.formattingContextRoot()) == this);
-    // Anonymous text wrappers/line break boxes should not need display boxes.
-    ASSERT(!layoutBox.isInlineTextBox() && (!layoutBox.isLineBreakBox() || layoutBox.isOutOfFlowPositioned()));
+    // Anonymous text wrappers do not need display boxes.
+    ASSERT(!layoutBox.isInlineTextBox());
     return layoutState().ensureGeometryForBox(layoutBox);
 }

trunk/Source/WebCore/layout/Verification.cpp

@@ -335 +335 @@
     TextStream stream;
     auto& layoutRoot = layoutState.root();
-    auto mismatchingGeometry = verifyAndOutputSubtree(stream, layoutState, rootRenderer, layoutRoot);
-    if (!mismatchingGeometry)
-        return;
 #if ENABLE(TREE_DEBUGGING)
     showRenderTree(&rootRenderer);
     showLayoutTree(layoutRoot, &layoutState);
 #endif
+    auto mismatchingGeometry = verifyAndOutputSubtree(stream, layoutState, rootRenderer, layoutRoot);
+    if (!mismatchingGeometry)
+        return;
     WTFLogAlways("%s", stream.release().utf8().data());
     ASSERT_NOT_REACHED();

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

@@ -114 +114 @@
                 computeHeightAndMargin(*layoutBox, constraints.horizontal);
             }
+        } else if (layoutBox->isLineBreakBox()) {
+            auto& boxGeometry = formattingState().boxGeometry(*layoutBox);
+            boxGeometry.setHorizontalMargin({ });
+            boxGeometry.setBorder({ });
+            boxGeometry.setPadding({ });
+            boxGeometry.setContentBoxWidth({ });
+            boxGeometry.setVerticalMargin({ });
         } else if (layoutBox->isInlineBox()) {
-            // Text wrapper boxes (anonymous inline level boxes) and <br>s don't have box geometries (they only generate runs).
-            if (!layoutBox->isInlineTextBox() && !layoutBox->isLineBreakBox()) {
+            // Text wrapper boxes (anonymous inline level boxes) don't have box geometries (they only generate runs).
+            if (!layoutBox->isInlineTextBox()) {
                 // Inline boxes (<span>) can't get sized/positioned yet. At this point we can only compute their margins, borders and padding.
                 computeBorderAndPadding(*layoutBox, constraints.horizontal);
@@ -207 +214 @@
     // In order to compute the max/min widths, we need to compute margins, borders and padding for certain inline boxes first.
     while (layoutBox) {
-        if (layoutBox->isInlineTextBox() || layoutBox->isLineBreakBox()) {
+        if (layoutBox->isInlineTextBox()) {
             layoutBox = nextInlineLevelBoxToLayout(*layoutBox, root());
             continue;
@@ -428 +435 @@
         // Create the inline runs on the current line. This is mostly text and atomic inline runs.
         for (auto& lineRun : lineContent.runs) {
+            // FIXME: We should not need to construct a line run for <br>.
             if (lineRun.isText() || lineRun.isLineBreak())
                 formattingState.addLineRun({ lineIndex, lineRun.layoutBox(), lineBox.logicalRectForTextRun(lineRun), lineRun.expansion(), lineRun.textContent() });
@@ -461 +469 @@
                 boxGeometry.setLogicalTopLeft(toLayoutPoint(borderBoxLogicalTopLeft));
                 continue;
+            }
+            if (layoutBox.isLineBreakBox()) {
+                boxGeometry.setLogicalTopLeft(toLayoutPoint(borderBoxLogicalTopLeft));
+                boxGeometry.setContentBoxHeight(toLayoutUnit(inlineBox->logicalHeight()));
             }
             auto marginBoxWidth = inlineBox->logicalWidth();

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

@@ -226 +226 @@
     for (auto& run : runs) {
         auto& inlineLevelBox = run.layoutBox();
+        auto logicalLeft = horizontalAligmentOffset + run.logicalLeft();
         if (run.isBox()) {
-            auto logicalLeft = horizontalAligmentOffset + run.logicalLeft();
             auto& inlineLevelBoxGeometry = formattingContext().geometryForBox(inlineLevelBox);
             auto logicalHeight = inlineLevelBoxGeometry.marginBoxHeight();
@@ -254 +254 @@
             lineBox.addInlineBox(WTFMove(inlineBox));
         } else if (run.isContainerStart()) {
-            auto logicalLeft = horizontalAligmentOffset + run.logicalLeft();
             auto initialLogicalWidth = lineBox.logicalWidth() - run.logicalLeft();
             ASSERT(initialLogicalWidth >= 0);
@@ -262 +261 @@
             auto& inlineBox = lineBox.inlineBoxForLayoutBox(inlineLevelBox);
             inlineBox.setLogicalWidth(run.logicalRight() - inlineBox.logicalLeft());
-        } else if (run.isText() || run.isLineBreak()) {
+        } else if (run.isText() || run.isSoftLineBreak()) {
             auto& parentBox = inlineLevelBox.parent();
             auto& parentInlineBox = &parentBox == &rootBox() ? lineBox.rootInlineBox() : lineBox.inlineBoxForLayoutBox(parentBox);
@@ -270 +269 @@
                 adjustVerticalGeometryForNonEmptyInlineBox(parentInlineBox);
             }
-        }
+        } else if (run.isHardLineBreak()) {
+            auto inlineBox = LineBox::InlineBox::createBoxForInlineBox(inlineLevelBox, logicalLeft, { });
+            inlineBox->setIsNonEmpty();
+            adjustVerticalGeometryForNonEmptyInlineBox(*inlineBox);
+            lineBox.addInlineBox(WTFMove(inlineBox));
+        } else if (run.isWordBreakOpportunity())
+            lineBox.addInlineBox(LineBox::InlineBox::createBoxForInlineBox(inlineLevelBox, logicalLeft, { }));
+        else
+            ASSERT_NOT_REACHED();
     }
 }

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

@@ -66 +66 @@
         bool isText() const { return m_type == InlineItem::Type::Text; }
         bool isBox() const { return m_type == InlineItem::Type::Box; }
-        bool isLineBreak() const { return m_type == InlineItem::Type::HardLineBreak || m_type == InlineItem::Type::SoftLineBreak; }
+        bool isLineBreak() const { return isHardLineBreak() || isSoftLineBreak(); }
+        bool isSoftLineBreak() const  { return m_type == InlineItem::Type::SoftLineBreak; }
+        bool isHardLineBreak() const { return m_type == InlineItem::Type::HardLineBreak; }
         bool isWordBreakOpportunity() const { return m_type == InlineItem::Type::WordBreakOpportunity; }
         bool isContainerStart() const { return m_type == InlineItem::Type::ContainerStart; }

trunk/Source/WebCore/layout/tableformatting/TableFormattingContext.cpp

@@ -125 +125 @@
                 auto& formattingState = layoutState().establishedFormattingState(cellBox);
                 for (auto* child = cellBox.firstInFlowOrFloatingChild(); child; child = child->nextInFlowOrFloatingSibling()) {
-                    if (child->isAnonymous() || child->isLineBreakBox())
+                    if (child->isInlineTextBox())
                         continue;
                     formattingState.boxGeometry(*child).moveVertically(intrinsicPaddingTop);