Changeset 285931 in webkit

Timestamp:

Nov 17, 2021, 8:30:20 AM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Fix imported/w3c/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-013.html
​https://bugs.webkit.org/show_bug.cgi?id=233237

Reviewed by Antti Koivisto.

Do not take hanging glyphs into account when measuring content for preferred width.
(Note that this patch is in preparation for enabling IFC preferred width computation)

• layout/formattingContexts/inline/InlineLine.cpp:

(WebCore::Layout::Line::removeHangingGlyphs):

• layout/formattingContexts/inline/InlineLine.h:
• layout/formattingContexts/inline/InlineLineBuilder.cpp:

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

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/formattingContexts/inline/InlineLine.cpp (modified) (1 diff)
• layout/formattingContexts/inline/InlineLine.h (modified) (1 diff)
• layout/formattingContexts/inline/InlineLineBuilder.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-11-17  Alan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Fix imported/w3c/web-platform-tests/css/css-text/white-space/white-space-intrinsic-size-013.html
+        https://bugs.webkit.org/show_bug.cgi?id=233237
+
+        Reviewed by Antti Koivisto.
+
+        Do not take hanging glyphs into account when measuring content for preferred width.
+        (Note that this patch is in preparation for enabling IFC preferred width computation)
+
+        * layout/formattingContexts/inline/InlineLine.cpp:
+        (WebCore::Layout::Line::removeHangingGlyphs):
+        * layout/formattingContexts/inline/InlineLine.h:
+        * layout/formattingContexts/inline/InlineLineBuilder.cpp:
+        (WebCore::Layout::LineBuilder::close):
+
 2021-11-17  Alan Bujtas  <zalan@apple.com>
 

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

@@ -195 +195 @@
 
     m_contentLogicalWidth -= m_trimmableTrailingContent.remove();
+}
+
+void Line::removeHangingGlyphs()
+{
+    ASSERT(m_trimmableTrailingContent.isEmpty());
+    m_contentLogicalWidth -= m_hangingTrailingContent.width();
+    m_hangingTrailingContent.reset();
 }
 

trunk/Source/WebCore/layout/formattingContexts/inline/InlineLine.h

@@ -65 +65 @@
 
     void removeTrailingTrimmableContent();
+    void removeHangingGlyphs();
     void visuallyCollapseHangingOverflowingGlyphs(InlineLayoutUnit horizontalAvailableSpace);
     void applyRunExpansion(InlineLayoutUnit horizontalAvailableSpace);

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

@@ -459 +459 @@
     auto horizontalAvailableSpace = m_lineLogicalRect.width();
     m_line.removeTrailingTrimmableContent();
-    m_line.visuallyCollapseHangingOverflowingGlyphs(horizontalAvailableSpace);
+    if (isInIntrinsicWidthMode()) {
+        // 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();
+    } else
+        m_line.visuallyCollapseHangingOverflowingGlyphs(horizontalAvailableSpace);
+
     auto horizontalAlignment = root().style().textAlign();
     auto runsExpandHorizontally = horizontalAlignment == TextAlignMode::Justify && !isLastLineWithInlineContent(lineRange, needsLayoutRange.end, committedContent.partialTrailingContentLength);