Changeset 285999 in webkit

Timestamp:

Nov 18, 2021, 6:20:45 AM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Glyphs that conditionally hang are taken into account for max-content only
​https://bugs.webkit.org/show_bug.cgi?id=233287

Reviewed by Antti Koivisto.

Remove hanging glyphs for min-content only. It simply means that content followed by (pre-wrap) whitespace may make shrink wrapped lines wider.

• layout/formattingContexts/inline/InlineLineBuilder.cpp:

(WebCore::Layout::LineBuilder::close):

• rendering/RenderBlockFlow.cpp:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/formattingContexts/inline/InlineLineBuilder.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-11-18  Alan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Glyphs that conditionally hang are taken into account for max-content only
+        https://bugs.webkit.org/show_bug.cgi?id=233287
+
+        Reviewed by Antti Koivisto.
+
+        Remove hanging glyphs for min-content only. It simply means that content followed by (pre-wrap) whitespace may make shrink wrapped lines wider. 
+
+        * layout/formattingContexts/inline/InlineLineBuilder.cpp:
+        (WebCore::Layout::LineBuilder::close):
+        * rendering/RenderBlockFlow.cpp:
+
 2021-11-18  Ziran Sun  <zsun@igalia.com>
 

trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBuilder.cpp

@@ -460 +460 @@
         return lineRange;
     }
+    auto isLastLine = isLastLineWithInlineContent(lineRange, needsLayoutRange.end, committedContent.partialTrailingContentLength);
     auto horizontalAvailableSpace = m_lineLogicalRect.width();
     auto isInIntrinsicWidthMode = this->isInIntrinsicWidthMode();
@@ -473 +474 @@
         // When a glyph at the start or end edge of a line hangs, it is not considered when measuring the line’s contents for fit.
         // https://drafts.csswg.org/css-text/#hanging
-        // FIXME: Add support for conditionally hanging glyphs.
-        m_line.removeHangingGlyphs();
+        if (*intrinsicWidthMode() == IntrinsicWidthMode::Minimum)
+            m_line.removeHangingGlyphs();
+        else {
+            // Glyphs that conditionally hang are not taken into account when computing min-content sizes and any sizes derived thereof, but they are taken into account for max-content sizes and any sizes derived thereof.
+            auto isConditionalHanging = isLastLine || (!m_line.runs().isEmpty() && m_line.runs().last().isLineBreak());
+            if (!isConditionalHanging)
+                m_line.removeHangingGlyphs();
+        }
     } else
         m_line.visuallyCollapseHangingOverflowingGlyphs(horizontalAvailableSpace);
 
     auto horizontalAlignment = root().style().textAlign();
-    auto runsExpandHorizontally = horizontalAlignment == TextAlignMode::Justify && !isLastLineWithInlineContent(lineRange, needsLayoutRange.end, committedContent.partialTrailingContentLength);
+    auto runsExpandHorizontally = horizontalAlignment == TextAlignMode::Justify && !isLastLine;
     if (runsExpandHorizontally)
         m_line.applyRunExpansion(horizontalAvailableSpace);