Changeset 246066 in webkit

Timestamp:

Jun 4, 2019 8:49:56 AM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Add hard line break handling to LineBreaker
​https://bugs.webkit.org/show_bug.cgi?id=198503
<rdar://problem/51373482>

Reviewed by Antti Koivisto.

LineBreaker should simply return BreakingContext::Keep with the breaking opportunity of yes.

• layout/inlineformatting/InlineFormattingContextLineLayout.cpp:

(WebCore::Layout::InlineFormattingContext::LineLayout::placeInlineItems const):

• layout/inlineformatting/InlineLineBreaker.cpp:

(WebCore::Layout::LineBreaker::breakingContext):
(WebCore::Layout::LineBreaker::wordBreakingBehavior const):
(WebCore::Layout::LineBreaker::isAtBreakingOpportunity):

• layout/inlineformatting/InlineLineBreaker.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/inlineformatting/InlineFormattingContextLineLayout.cpp (modified) (1 diff)
• layout/inlineformatting/InlineLineBreaker.cpp (modified) (3 diffs)
• layout/inlineformatting/InlineLineBreaker.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-06-04  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Add hard line break handling to LineBreaker
+        https://bugs.webkit.org/show_bug.cgi?id=198503
+        <rdar://problem/51373482>
+
+        Reviewed by Antti Koivisto.
+
+        LineBreaker should simply return BreakingContext::Keep with the breaking opportunity of yes.
+
+        * layout/inlineformatting/InlineFormattingContextLineLayout.cpp:
+        (WebCore::Layout::InlineFormattingContext::LineLayout::placeInlineItems const):
+        * layout/inlineformatting/InlineLineBreaker.cpp:
+        (WebCore::Layout::LineBreaker::breakingContext):
+        (WebCore::Layout::LineBreaker::wordBreakingBehavior const):
+        (WebCore::Layout::LineBreaker::isAtBreakingOpportunity):
+        * layout/inlineformatting/InlineLineBreaker.h:
+
 2019-06-04  Zalan Bujtas  <zalan@apple.com>
 

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

@@ -215 +215 @@
         auto inlineItemWidth = WebCore::Layout::inlineItemWidth(layoutState(), *inlineItem, currentLogicalRight);
 
+        // FIXME: Ensure LineContext::trimmableWidth includes uncommitted content if needed.
+        auto breakingContext = lineBreaker.breakingContext(*inlineItem, inlineItemWidth, { availableWidth, currentLogicalRight, line->trailingTrimmableWidth(), !line->hasContent() });
+        if (breakingContext.isAtBreakingOpportunity)
+            commitPendingContent();
+
+        // Content does not fit the current line.
+        if (breakingContext.breakingBehavior == LineBreaker::BreakingBehavior::Wrap)
+            return closeLine();
+
+        // Partial content stays on the current line. 
+        if (breakingContext.breakingBehavior == LineBreaker::BreakingBehavior::Split) {
+            ASSERT(inlineItem->isText());
+
+            ASSERT_NOT_IMPLEMENTED_YET();
+            return closeLine();
+        }
+
+        ASSERT(breakingContext.breakingBehavior == LineBreaker::BreakingBehavior::Keep);
+        if (inlineItem->isFloat()) {
+            handleFloat(*line, floatingContext, *inlineItem);
+            ++committedInlineItemCount;
+            continue;
+        }
         if (inlineItem->isHardLineBreak()) {
             uncommittedContent.add(*inlineItem, inlineItemWidth);
             commitPendingContent();
             return closeLine();
-        }
-        // FIXME: Ensure LineContext::trimmableWidth includes uncommitted content if needed.
-        auto breakingContext = lineBreaker.breakingContext(*inlineItem, inlineItemWidth, { availableWidth, currentLogicalRight, line->trailingTrimmableWidth(), !line->hasContent() });
-        if (breakingContext.isAtBreakingOpportunity)
-            commitPendingContent();
-
-        // Content does not fit the current line.
-        if (breakingContext.breakingBehavior == LineBreaker::BreakingBehavior::Wrap)
-            return closeLine();
-
-        // Partial content stays on the current line. 
-        if (breakingContext.breakingBehavior == LineBreaker::BreakingBehavior::Break) {
-            ASSERT(inlineItem->isText());
-
-            ASSERT_NOT_IMPLEMENTED_YET();
-            return closeLine();
-        }
-
-        if (inlineItem->isFloat()) {
-            handleFloat(*line, floatingContext, *inlineItem);
-            ++committedInlineItemCount;
-            continue;
         }
 

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

@@ -41 +41 @@
         return { BreakingBehavior::Keep, isAtBreakingOpportunity(inlineItem) };
 
+    if (inlineItem.isHardLineBreak())
+        return { BreakingBehavior::Keep, isAtBreakingOpportunity(inlineItem) };
+
     if (is<InlineTextItem>(inlineItem))
         return { wordBreakingBehavior(downcast<InlineTextItem>(inlineItem), lineContext.isEmpty), isAtBreakingOpportunity(inlineItem) };
@@ -63 +66 @@
 
     if (inlineItem.isWhitespace())
-        return style.collapseWhiteSpace() ? BreakingBehavior::Wrap : BreakingBehavior::Break;
+        return style.collapseWhiteSpace() ? BreakingBehavior::Wrap : BreakingBehavior::Split;
 
     auto shouldHypenate = !m_hyphenationIsDisabled && style.hyphens() == Hyphens::Auto && canHyphenate(style.locale());
     if (shouldHypenate)
-        return BreakingBehavior::Break;
+        return BreakingBehavior::Split;
 
     if (style.autoWrap()) {
         // Break any word
         if (style.wordBreak() == WordBreak::BreakAll)
-            return BreakingBehavior::Break;
+            return BreakingBehavior::Split;
 
         // Break first run on line.
         if (lineIsEmpty && style.breakWords() && style.preserveNewline())
-            return BreakingBehavior::Break;
+            return BreakingBehavior::Split;
     }
 
@@ -85 +88 @@
 bool LineBreaker::isAtBreakingOpportunity(const InlineItem& inlineItem)
 {
+    if (inlineItem.isHardLineBreak())
+        return true;
+
     if (is<InlineTextItem>(inlineItem))
         return downcast<InlineTextItem>(inlineItem).isWhitespace();

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

@@ -35 +35 @@
 class LineBreaker {
 public:
-    enum class BreakingBehavior { Keep, Break, Wrap };
+    enum class BreakingBehavior { Keep, Split, Wrap };
     struct BreakingContext {
         BreakingBehavior breakingBehavior;