Changeset 270153 in webkit

Timestamp:

Nov 21, 2020 12:46:25 PM (3 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Move current logicalLeft from ContinuousContent to LineStatus
​https://bugs.webkit.org/show_bug.cgi?id=219237

Reviewed by Antti Koivisto.

Retain the content logical right in the LineStatus instead (this is used to measure text properly (see xPos) while finding hyphen position).

• layout/inlineformatting/InlineContentBreaker.cpp:

(WebCore::Layout::InlineContentBreaker::processOverflowingTextContent const):
(WebCore::Layout::InlineContentBreaker::ContinuousContent::reset):

• layout/inlineformatting/InlineContentBreaker.h:

(WebCore::Layout::InlineContentBreaker::ContinuousContent::logicalWidth const):
(WebCore::Layout::InlineContentBreaker::ContinuousContent::logicalLeft const): Deleted.

• layout/inlineformatting/InlineLineBuilder.cpp:

(WebCore::Layout::LineCandidate::InlineContent::reset):
(WebCore::Layout::LineCandidate::reset):
(WebCore::Layout::LineBuilder::nextContentForLine):
(WebCore::Layout::LineBuilder::handleFloatsAndInlineContent):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/inlineformatting/InlineContentBreaker.cpp (modified) (3 diffs)
• layout/inlineformatting/InlineContentBreaker.h (modified) (4 diffs)
• layout/inlineformatting/InlineLineBuilder.cpp (modified) (6 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-11-21  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Move current logicalLeft from ContinuousContent to LineStatus
+        https://bugs.webkit.org/show_bug.cgi?id=219237
+
+        Reviewed by Antti Koivisto.
+
+        Retain the content logical right in the LineStatus instead (this is used to measure text properly (see xPos) while finding hyphen position).
+
+        * layout/inlineformatting/InlineContentBreaker.cpp:
+        (WebCore::Layout::InlineContentBreaker::processOverflowingTextContent const):
+        (WebCore::Layout::InlineContentBreaker::ContinuousContent::reset):
+        * layout/inlineformatting/InlineContentBreaker.h:
+        (WebCore::Layout::InlineContentBreaker::ContinuousContent::logicalWidth const):
+        (WebCore::Layout::InlineContentBreaker::ContinuousContent::logicalLeft const): Deleted.
+        * layout/inlineformatting/InlineLineBuilder.cpp:
+        (WebCore::Layout::LineCandidate::InlineContent::reset):
+        (WebCore::Layout::LineCandidate::reset):
+        (WebCore::Layout::LineBuilder::nextContentForLine):
+        (WebCore::Layout::LineBuilder::handleFloatsAndInlineContent):
+
 2020-11-21  Simon Fraser  <simon.fraser@apple.com>
 

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

@@ -275 +275 @@
             // When the first span computes longer than the available space, by the time we get to the second span, the adjusted available space becomes negative.
             auto adjustedAvailableWidth = std::max<InlineLayoutUnit>(0, lineStatus.availableWidth - accumulatedRunWidth);
-            if (auto partialRun = tryBreakingTextRun(run, continuousContent.logicalLeft() + accumulatedRunWidth, adjustedAvailableWidth)) {
+            if (auto partialRun = tryBreakingTextRun(run, lineStatus.contentLogicalRight + accumulatedRunWidth, adjustedAvailableWidth)) {
                 if (partialRun->length)
                     return TrailingTextContent { index, false, partialRun };
@@ -297 +297 @@
         if (isBreakableRun(run)) {
             ASSERT(run.inlineItem.isText());
-            if (auto partialRun = tryBreakingTextRun(run, continuousContent.logicalLeft() + accumulatedRunWidth, maxInlineLayoutUnit())) {
+            if (auto partialRun = tryBreakingTextRun(run, lineStatus.contentLogicalRight + accumulatedRunWidth, maxInlineLayoutUnit())) {
                 // We know this run fits, so if wrapping is allowed on the run, it should return a non-empty left-side.
                 ASSERT(partialRun->length);
@@ -413 +413 @@
 }
 
-void InlineContentBreaker::ContinuousContent::reset(InlineLayoutUnit contentLogicalLeft)
-{
-    m_logicalLeft = contentLogicalLeft;
+void InlineContentBreaker::ContinuousContent::reset()
+{
     m_logicalWidth = { };
     m_collapsibleLogicalWidth = { };

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

@@ -80 +80 @@
     struct ContinuousContent {
         InlineLayoutUnit logicalWidth() const { return m_logicalWidth; }
-        InlineLayoutUnit logicalLeft() const { return m_logicalLeft; }
         InlineLayoutUnit collapsibleLogicalWidth() const { return m_collapsibleLogicalWidth; }
         InlineLayoutUnit nonCollapsibleLogicalWidth() const { return logicalWidth() - collapsibleLogicalWidth(); }
@@ -87 +86 @@
 
         void append(const InlineItem&, InlineLayoutUnit logicalWidth, Optional<InlineLayoutUnit> collapsibleWidth);
-        void reset(InlineLayoutUnit contentLogicalLeft);
+        void reset();
 
         struct Run {
@@ -102 +101 @@
     private:
         RunList m_runs;
-        InlineLayoutUnit m_logicalLeft { 0 };
         InlineLayoutUnit m_logicalWidth { 0 };
         InlineLayoutUnit m_collapsibleLogicalWidth { 0 };
@@ -108 +106 @@
 
     struct LineStatus {
+        InlineLayoutUnit contentLogicalRight { 0 };
         InlineLayoutUnit availableWidth { 0 };
         InlineLayoutUnit collapsibleWidth { 0 };

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

@@ -125 +125 @@
     LineCandidate(bool ignoreTrailingLetterSpacing);
 
-    void reset(InlineLayoutUnit contentLogicalLeft);
+    void reset();
 
     struct InlineContent {
@@ -137 +137 @@
         void appendTrailingLineBreak(const InlineItem& lineBreakItem) { m_trailingLineBreak = &lineBreakItem; }
         void appendtrailingWordBreakOpportunity(const InlineItem& wordBreakItem) { m_trailingWordBreakOpportunity = &wordBreakItem; }
-        void reset(InlineLayoutUnit contentLogicalLeft);
+        void reset();
 
     private:
@@ -203 +203 @@
 }
 
-inline void LineCandidate::InlineContent::reset(InlineLayoutUnit contentLogicalLeft)
-{
-    m_continuousContent.reset(contentLogicalLeft);
+inline void LineCandidate::InlineContent::reset()
+{
+    m_continuousContent.reset();
     m_trailingLineBreak = { };
     m_trailingWordBreakOpportunity = { };
@@ -223 +223 @@
 }
 
-inline void LineCandidate::reset(InlineLayoutUnit contentLogicalLeft)
+inline void LineCandidate::reset()
 {
     floatContent.reset();
-    inlineContent.reset(contentLogicalLeft);
+    inlineContent.reset();
 }
 
@@ -455 +455 @@
 {
     ASSERT(currentInlineItemIndex < layoutRange.end);
-    lineCandidate.reset(currentLogicalRight);
+    lineCandidate.reset();
     // 1. Simply add any overflow content from the previous line to the candidate content. It's always a text content.
     // 2. Find the next soft wrap position or explicit line break.
@@ -608 +608 @@
     auto availableWidth = this->availableWidth() - floatContent.intrusiveWidth();
     auto isLineConsideredEmpty = m_line.isConsideredEmpty() && !m_contentIsConstrainedByFloat;
-    auto lineStatus = InlineContentBreaker::LineStatus { availableWidth, m_line.trimmableTrailingWidth(), m_line.trailingSoftHyphenWidth(), m_line.isTrailingRunFullyTrimmable(), isLineConsideredEmpty };
+    auto lineStatus = InlineContentBreaker::LineStatus { m_line.contentLogicalWidth(), availableWidth, m_line.trimmableTrailingWidth(), m_line.trailingSoftHyphenWidth(), m_line.isTrailingRunFullyTrimmable(), isLineConsideredEmpty };
     auto result = inlineContentBreaker.processInlineContent(continuousInlineContent, lineStatus);
     if (result.lastWrapOpportunityItem)