Changeset 271359 in webkit

Timestamp:

Jan 11, 2021 6:56:06 AM (3 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] InlineBox::setHasContent should be called when the inline box actually has some content
​https://bugs.webkit.org/show_bug.cgi?id=220245

Reviewed by Antti Koivisto.

Do not call setHasContent unless the inline box has actual content (excluding border and padding).
However the "will stretch the line" logic checks against borders and paddings so move that over to
Quirks::inlineLevelBoxAffectsLineBox.
This change makes Quirks::inlineLevelBoxAffectsLineBox the only client of LineBox::isConsideredEmpty.

• layout/inlineformatting/InlineFormattingContextGeometry.cpp:

(WebCore::Layout::LineBoxBuilder::constructInlineLevelBoxes):

• layout/inlineformatting/InlineFormattingContextQuirks.cpp:

(WebCore::Layout::InlineFormattingContext::Quirks::inlineLevelBoxAffectsLineBox const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/inlineformatting/InlineFormattingContextGeometry.cpp (modified) (2 diffs)
• layout/inlineformatting/InlineFormattingContextQuirks.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-01-11  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] InlineBox::setHasContent should be called when the inline box actually has some content
+        https://bugs.webkit.org/show_bug.cgi?id=220245
+
+        Reviewed by Antti Koivisto.
+
+        Do not call setHasContent unless the inline box has actual content (excluding border and padding).
+        However the "will stretch the line" logic checks against borders and paddings so move that over to
+        Quirks::inlineLevelBoxAffectsLineBox.
+        This change makes Quirks::inlineLevelBoxAffectsLineBox the only client of LineBox::isConsideredEmpty.
+
+        * layout/inlineformatting/InlineFormattingContextGeometry.cpp:
+        (WebCore::Layout::LineBoxBuilder::constructInlineLevelBoxes):
+        * layout/inlineformatting/InlineFormattingContextQuirks.cpp:
+        (WebCore::Layout::InlineFormattingContext::Quirks::inlineLevelBoxAffectsLineBox const):
+
 2021-01-11  Kimmo Kinnunen  <kkinnunen@apple.com>
 

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

@@ -218 +218 @@
     auto createRootInlineBox = [&] {
         auto rootInlineBox = LineBox::InlineLevelBox::createRootInlineBox(rootBox(), horizontalAligmentOffset, lineBox.logicalWidth());
-
-        auto inlineBoxHasImaginaryStrut = layoutState().inNoQuirksMode();
-        auto isInitiallyConsideredNonEmpty = !lineBox.isConsideredEmpty() && inlineBoxHasImaginaryStrut;
-        if (isInitiallyConsideredNonEmpty)
-            rootInlineBox->setHasContent();
         setVerticalGeometryForInlineBox(*rootInlineBox);
         simplifiedVerticalAlignment = { { } , rootInlineBox->layoutBounds().height(), rootInlineBox->layoutBounds().ascent - rootInlineBox->baseline() };
@@ -327 +322 @@
             ASSERT(initialLogicalWidth >= 0);
             auto inlineBox = LineBox::InlineLevelBox::createInlineBox(layoutBox, logicalLeft, initialLogicalWidth);
-            auto& inlineBoxGeometry = formattingContext().geometryForBox(layoutBox);
-            // Inline level boxes on empty lines are still considered empty (e.g. <span><div>pre and post blocks are empty</div></span>)
-            auto inlineBoxHasImaginaryStrut = layoutState().inNoQuirksMode() && !lineBox.isConsideredEmpty();
-            auto isConsideredNonEmpty = inlineBoxHasImaginaryStrut || inlineBoxGeometry.horizontalPadding().valueOr(0_lu) || inlineBoxGeometry.horizontalBorder();
-            if (isConsideredNonEmpty)
-                inlineBox->setHasContent();
             setVerticalGeometryForInlineBox(*inlineBox);
             lineBox.addInlineLevelBox(WTFMove(inlineBox));

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

@@ -43 +43 @@
 bool InlineFormattingContext::Quirks::inlineLevelBoxAffectsLineBox(const LineBox::InlineLevelBox& inlineLevelBox, const LineBox& lineBox) const
 {
-    if (inlineLevelBox.isInlineBox())
-        return inlineLevelBox.hasContent();
+    if (inlineLevelBox.isInlineBox()) {
+        // Inline boxes (e.g. root inline box or <span>) affects line boxes either through the strut or actual content.
+        if (inlineLevelBox.hasContent())
+            return true;
+        if (!inlineLevelBox.isRootInlineBox()) {
+            auto& boxGeometry = formattingContext().geometryForBox(inlineLevelBox.layoutBox());
+            if (boxGeometry.horizontalBorder() || boxGeometry.horizontalPadding().valueOr(0_lu)) {
+                // Horizontal border and padding make the inline box stretch the line (e.g. <span style="padding: 10px;"></span>).
+                return true;
+            }
+        }
+        auto inlineBoxHasImaginaryStrut = layoutState().inNoQuirksMode();
+        return inlineBoxHasImaginaryStrut && !lineBox.isConsideredEmpty();
+    }
     if (inlineLevelBox.isLineBreakBox()) {
         // <br> in non-standard mode stretches the line box only when the line is empty.