Changeset 285930 in webkit

Timestamp:

Nov 17, 2021, 7:10:51 AM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] break-word is not considered when calculating min-content intrinsic sizes.
​https://bugs.webkit.org/show_bug.cgi?id=233222

Reviewed by Antti Koivisto.

See ​https://drafts.csswg.org/css-text/#overflow-wrap-property

• layout/formattingContexts/inline/InlineContentBreaker.cpp:

(WebCore::Layout::InlineContentBreaker::InlineContentBreaker):
(WebCore::Layout::InlineContentBreaker::wordBreakBehavior const):

• layout/formattingContexts/inline/InlineContentBreaker.h:

(WebCore::Layout::InlineContentBreaker::isIntrinsicWidthMode const):

• layout/formattingContexts/inline/InlineLineBuilder.cpp:

(WebCore::Layout::LineBuilder::placeInlineContent):
(WebCore::Layout::LineBuilder::initialConstraintsForLine const):

• layout/formattingContexts/inline/InlineLineBuilder.h:

(WebCore::Layout::LineBuilder::isIntrinsicWidthMode const):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-11-17  Alan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] break-word is not considered when calculating min-content intrinsic sizes.
+        https://bugs.webkit.org/show_bug.cgi?id=233222
+
+        Reviewed by Antti Koivisto.
+
+        See https://drafts.csswg.org/css-text/#overflow-wrap-property
+
+        * layout/formattingContexts/inline/InlineContentBreaker.cpp:
+        (WebCore::Layout::InlineContentBreaker::InlineContentBreaker):
+        (WebCore::Layout::InlineContentBreaker::wordBreakBehavior const):
+        * layout/formattingContexts/inline/InlineContentBreaker.h:
+        (WebCore::Layout::InlineContentBreaker::isIntrinsicWidthMode const):
+        * layout/formattingContexts/inline/InlineLineBuilder.cpp:
+        (WebCore::Layout::LineBuilder::placeInlineContent):
+        (WebCore::Layout::LineBuilder::initialConstraintsForLine const):
+        * layout/formattingContexts/inline/InlineLineBuilder.h:
+        (WebCore::Layout::LineBuilder::isIntrinsicWidthMode const):
+
 2021-11-17  Youenn Fablet  <youenn@apple.com>
 

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

@@ -124 +124 @@
     }
     return { };
+}
+
+InlineContentBreaker::InlineContentBreaker(bool isInIntrinsicWidthMode)
+    : m_isInIntrinsicWidthMode(isInIntrinsicWidthMode)
+{
 }
 
@@ -647 +652 @@
         return { };
     };
+
+    // Soft wrap opportunities introduced by break-word are not considered when calculating min-content intrinsic sizes.
+    auto breakWordIsApplicable = !isInIntrinsicWidthMode();
     // For compatibility with legacy content, the word-break property also supports a deprecated break-word keyword.
     // When specified, this has the same effect as word-break: normal and overflow-wrap: anywhere, regardless of the actual value of the overflow-wrap property.
-    if (style.wordBreak() == WordBreak::BreakWord && !hasWrapOpportunityAtPreviousPosition)
+    if ((breakWordIsApplicable && style.wordBreak() == WordBreak::BreakWord) && !hasWrapOpportunityAtPreviousPosition)
         return includeHyphenationIfAllowed(WordBreakRule::AtArbitraryPosition);
     // OverflowWrap::BreakWord/Anywhere An otherwise unbreakable sequence of characters may be broken at an arbitrary point if there are no otherwise-acceptable break points in the line.
     // Note that this applies to content where CSS properties (e.g. WordBreak::KeepAll) make it unbreakable. 
-    if ((style.overflowWrap() == OverflowWrap::BreakWord || style.overflowWrap() == OverflowWrap::Anywhere) && !hasWrapOpportunityAtPreviousPosition)
+    if (((breakWordIsApplicable && style.overflowWrap() == OverflowWrap::BreakWord) || style.overflowWrap() == OverflowWrap::Anywhere) && !hasWrapOpportunityAtPreviousPosition)
         return includeHyphenationIfAllowed(WordBreakRule::AtArbitraryPosition);
     // Breaking is forbidden within “words”.

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

@@ -39 +39 @@
 class InlineContentBreaker {
 public:
+    InlineContentBreaker(bool isInIntrinsicWidthMode);
+
     struct PartialRun {
         size_t length { 0 };
@@ -149 +151 @@
     OptionSet<WordBreakRule> wordBreakBehavior(const RenderStyle&, bool hasWrapOpportunityAtPreviousPosition) const;
     bool shouldKeepEndOfLineWhitespace(const ContinuousContent&) const;
+    bool isInIntrinsicWidthMode() const { return m_isInIntrinsicWidthMode; }
 
+    bool m_isInIntrinsicWidthMode { false };
     bool n_hyphenationIsDisabled { false };
 };

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

@@ -269 +269 @@
 }
 
-LineBuilder::LineBuilder(InlineFormattingContext& inlineFormattingContext, FloatingState& floatingState, HorizontalConstraints rootHorizontalConstraints, const InlineItems& inlineItems, IsIntrinsicWidthMode isIntrinsicWidthMode)
-    : m_isIntrinsicWidthMode(isIntrinsicWidthMode == IsIntrinsicWidthMode::Yes)
+LineBuilder::LineBuilder(InlineFormattingContext& inlineFormattingContext, FloatingState& floatingState, HorizontalConstraints rootHorizontalConstraints, const InlineItems& inlineItems, IsInIntrinsicWidthMode isInIntrinsicWidthMode)
+    : m_isInIntrinsicWidthMode(isInIntrinsicWidthMode == IsInIntrinsicWidthMode::Yes)
     , m_inlineFormattingContext(inlineFormattingContext)
     , m_inlineFormattingState(&inlineFormattingContext.formattingState())
@@ -280 +280 @@
 }
 
-LineBuilder::LineBuilder(const InlineFormattingContext& inlineFormattingContext, const InlineItems& inlineItems, IsIntrinsicWidthMode isIntrinsicWidthMode)
-    : m_isIntrinsicWidthMode(isIntrinsicWidthMode == IsIntrinsicWidthMode::Yes)
+LineBuilder::LineBuilder(const InlineFormattingContext& inlineFormattingContext, const InlineItems& inlineItems, IsInIntrinsicWidthMode isInIntrinsicWidthMode)
+    : m_isInIntrinsicWidthMode(isInIntrinsicWidthMode == IsInIntrinsicWidthMode::Yes)
     , m_inlineFormattingContext(inlineFormattingContext)
     , m_line(inlineFormattingContext)
@@ -393 +393 @@
 {
     auto lineCandidate = LineCandidate { layoutState().shouldIgnoreTrailingLetterSpacing() };
-    auto inlineContentBreaker = InlineContentBreaker { };
+    auto inlineContentBreaker = InlineContentBreaker { isInIntrinsicWidthMode() };
 
     auto currentItemIndex = needsLayoutRange.start;
@@ -551 +551 @@
         if (textIndent == RenderStyle::initialTextIndent())
             return { };
-        if (m_isIntrinsicWidthMode && textIndent.isPercent()) {
+        if (isInIntrinsicWidthMode() && textIndent.isPercent()) {
             // Percentages must be treated as 0 for the purpose of calculating intrinsic size contributions.
             // https://drafts.csswg.org/css-text/#text-indent-property

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

@@ -40 +40 @@
 class LineBuilder {
 public:
-    enum class IsIntrinsicWidthMode { No, Yes };
-    LineBuilder(InlineFormattingContext&, FloatingState&, HorizontalConstraints rootHorizontalConstraints, const InlineItems&, IsIntrinsicWidthMode = IsIntrinsicWidthMode::No);
-    LineBuilder(const InlineFormattingContext&, const InlineItems&, IsIntrinsicWidthMode = IsIntrinsicWidthMode::Yes);
+    enum class IsInIntrinsicWidthMode { No, Yes };
+    LineBuilder(InlineFormattingContext&, FloatingState&, HorizontalConstraints rootHorizontalConstraints, const InlineItems&, IsInIntrinsicWidthMode = IsInIntrinsicWidthMode::No);
+    LineBuilder(const InlineFormattingContext&, const InlineItems&, IsInIntrinsicWidthMode = IsInIntrinsicWidthMode::Yes);
 
     struct InlineItemRange {
@@ -113 +113 @@
     bool isLastLineWithInlineContent(const InlineItemRange& lineRange, size_t lastInlineItemIndex, bool hasPartialTrailingContent) const;
 
+    bool isInIntrinsicWidthMode() const { return m_isInIntrinsicWidthMode; }
+
     const InlineFormattingContext& formattingContext() const { return m_inlineFormattingContext; }
     InlineFormattingState* formattingState() { return m_inlineFormattingState; }
@@ -122 +124 @@
 private:
     bool m_isFirstLine { false };
-    bool m_isIntrinsicWidthMode { false };
+    bool m_isInIntrinsicWidthMode { false };
     const InlineFormattingContext& m_inlineFormattingContext;
     InlineFormattingState* m_inlineFormattingState { nullptr };