Changeset 290127 in webkit

Timestamp:

Feb 18, 2022, 8:30:58 AM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][Integration] Add missing LineIteratorModernPath::isHorizontal implementation
​https://bugs.webkit.org/show_bug.cgi?id=236835

Reviewed by Antti Koivisto.

isHorizontal value comes from the root inline box's writing mode.

• layout/formattingContexts/inline/InlineLineBox.h:

(WebCore::Layout::LineBox::isHorizontal const):

• layout/formattingContexts/inline/display/InlineDisplayLine.h:

(WebCore::InlineDisplay::Line::isHorizontal const):
(WebCore::InlineDisplay::Line::Line):

• layout/formattingContexts/inline/display/InlineDisplayLineBuilder.cpp:

(WebCore::Layout::InlineDisplayLineBuilder::build const):

• layout/integration/InlineIteratorLineModernPath.h:

(WebCore::InlineIterator::LineIteratorModernPath::isHorizontal const):

• layout/integration/LayoutIntegrationInlineContentBuilder.cpp:

(WebCore::LayoutIntegration::InlineContentBuilder::createDisplayLines const):

• layout/integration/LayoutIntegrationLine.h:

(WebCore::LayoutIntegration::Line::Line):
(WebCore::LayoutIntegration::Line::isHorizontal const):

• layout/integration/LayoutIntegrationPagination.cpp:

(WebCore::LayoutIntegration::makeAdjustedContent):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/formattingContexts/inline/InlineLineBox.h (modified) (1 diff)
• layout/formattingContexts/inline/display/InlineDisplayLine.h (modified) (4 diffs)
• layout/formattingContexts/inline/display/InlineDisplayLineBuilder.cpp (modified) (1 diff)
• layout/integration/InlineIteratorLineModernPath.h (modified) (1 diff)
• layout/integration/LayoutIntegrationInlineContentBuilder.cpp (modified) (1 diff)
• layout/integration/LayoutIntegrationLine.h (modified) (4 diffs)
• layout/integration/LayoutIntegrationPagination.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-02-18  Alan Bujtas  <zalan@apple.com>
+
+        [LFC][Integration] Add missing LineIteratorModernPath::isHorizontal implementation
+        https://bugs.webkit.org/show_bug.cgi?id=236835
+
+        Reviewed by Antti Koivisto.
+
+        isHorizontal value comes from the root inline box's writing mode.
+
+        * layout/formattingContexts/inline/InlineLineBox.h:
+        (WebCore::Layout::LineBox::isHorizontal const):
+        * layout/formattingContexts/inline/display/InlineDisplayLine.h:
+        (WebCore::InlineDisplay::Line::isHorizontal const):
+        (WebCore::InlineDisplay::Line::Line):
+        * layout/formattingContexts/inline/display/InlineDisplayLineBuilder.cpp:
+        (WebCore::Layout::InlineDisplayLineBuilder::build const):
+        * layout/integration/InlineIteratorLineModernPath.h:
+        (WebCore::InlineIterator::LineIteratorModernPath::isHorizontal const):
+        * layout/integration/LayoutIntegrationInlineContentBuilder.cpp:
+        (WebCore::LayoutIntegration::InlineContentBuilder::createDisplayLines const):
+        * layout/integration/LayoutIntegrationLine.h:
+        (WebCore::LayoutIntegration::Line::Line):
+        (WebCore::LayoutIntegration::Line::isHorizontal const):
+        * layout/integration/LayoutIntegrationPagination.cpp:
+        (WebCore::LayoutIntegration::makeAdjustedContent):
+
 2022-02-18  Antoine Quint  <graouts@webkit.org>
 

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

@@ -82 +82 @@
     InlineLayoutUnit rootInlineBoxAlignmentOffset() const { return m_rootInlineBoxAlignmentOffset; }
     FontBaseline baselineType() const { return m_baselineType; }
+    bool isHorizontal() const { return m_rootInlineBox.layoutBox().style().isHorizontalWritingMode(); }
 
     const InlineRect& logicalRect() const { return m_logicalRect; }

trunk/Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayLine.h

@@ -42 +42 @@
         float bottom { 0 };
     };
-    Line(const FloatRect& lineBoxRect, const FloatRect& scrollableOverflow, EnclosingTopAndBottom, float aligmentBaseline, FontBaseline baselineType, float contentLogicalOffset, float contentLogicalWidth);
+    Line(const FloatRect& lineBoxRect, const FloatRect& scrollableOverflow, EnclosingTopAndBottom, float aligmentBaseline, FontBaseline baselineType, float contentLogicalOffset, float contentLogicalWidth, bool isHorizontal);
 
     float left() const { return m_lineBoxRect.x(); }
@@ -58 +58 @@
     float baseline() const { return m_aligmentBaseline; }
     FontBaseline baselineType() const { return m_baselineType; }
+
+    bool isHorizontal() const { return m_isHorizontal; }
 
     float contentLogicalOffset() const { return m_contentLogicalOffset; }
@@ -76 +78 @@
     float m_contentLogicalWidth { 0 };
     FontBaseline m_baselineType { AlphabeticBaseline };
+    bool m_isHorizontal { true };
 };
 
-inline Line::Line(const FloatRect& lineBoxRect, const FloatRect& scrollableOverflow, EnclosingTopAndBottom enclosingTopAndBottom, float aligmentBaseline, FontBaseline baselineType, float contentLogicalOffset, float contentLogicalWidth)
+inline Line::Line(const FloatRect& lineBoxRect, const FloatRect& scrollableOverflow, EnclosingTopAndBottom enclosingTopAndBottom, float aligmentBaseline, FontBaseline baselineType, float contentLogicalOffset, float contentLogicalWidth, bool isHorizontal)
     : m_lineBoxRect(lineBoxRect)
     , m_scrollableOverflow(scrollableOverflow)
@@ -86 +89 @@
     , m_contentLogicalWidth(contentLogicalWidth)
     , m_baselineType(baselineType)
+    , m_isHorizontal(isHorizontal)
 {
 }

trunk/Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayLineBuilder.cpp

@@ -104 +104 @@
         , contentVisualLeft
         , rootInlineBox.logicalWidth()
+        , lineBox.isHorizontal()
     };
 }

trunk/Source/WebCore/layout/integration/InlineIteratorLineModernPath.h

@@ -67 +67 @@
     float y() const { return lineBoxTop(); }
     float logicalHeight() const { return lineBoxBottom() - lineBoxTop(); }
-    bool isHorizontal() const { return true; }
+    bool isHorizontal() const { return line().isHorizontal(); }
     FontBaseline baselineType() const { return line().baselineType(); }
 

trunk/Source/WebCore/layout/integration/LayoutIntegrationInlineContentBuilder.cpp

@@ -138 +138 @@
 
         auto boxCount = boxIndex - firstBoxIndex;
-        inlineContent.lines.append({ firstBoxIndex, boxCount, FloatRect { line.lineBoxRect() }, line.enclosingTopAndBottom().top, line.enclosingTopAndBottom().bottom, scrollableOverflowRect, lineInkOverflowRect, line.baseline(), line.baselineType(), line.contentLogicalOffset(), line.contentLogicalWidth() });
+        inlineContent.lines.append({ firstBoxIndex, boxCount, FloatRect { line.lineBoxRect() }, line.enclosingTopAndBottom().top, line.enclosingTopAndBottom().bottom, scrollableOverflowRect, lineInkOverflowRect, line.baseline(), line.baselineType(), line.contentLogicalOffset(), line.contentLogicalWidth(), line.isHorizontal() });
     }
 }

trunk/Source/WebCore/layout/integration/LayoutIntegrationLine.h

@@ -37 +37 @@
     WTF_MAKE_FAST_ALLOCATED;
 public:
-    Line(size_t firstBoxIndex, size_t boxCount, const FloatRect& lineBoxRect, float enclosingContentTop, float enclosingContentBottom, const FloatRect& scrollableOverflow, const FloatRect& inkOverflow, float baseline, FontBaseline baselineType, float contentLogicalOffset, float contentLogicalWidth)
+    Line(size_t firstBoxIndex, size_t boxCount, const FloatRect& lineBoxRect, float enclosingContentTop, float enclosingContentBottom, const FloatRect& scrollableOverflow, const FloatRect& inkOverflow, float baseline, FontBaseline baselineType, float contentLogicalOffset, float contentLogicalWidth, bool isHorizontal)
         : m_firstBoxIndex(firstBoxIndex)
         , m_boxCount(boxCount)
@@ -49 +49 @@
         , m_contentLogicalWidth(contentLogicalWidth)
         , m_baselineType(baselineType)
+        , m_isHorizontal(isHorizontal)
     {
     }
@@ -71 +72 @@
     FontBaseline baselineType() const { return m_baselineType; }
 
+    bool isHorizontal() const { return m_isHorizontal; }
+
     float contentLogicalOffset() const { return m_contentLogicalOffset; }
     float contentLogicalWidth() const { return m_contentLogicalWidth; }
@@ -89 +92 @@
     float m_contentLogicalOffset { 0 };
     float m_contentLogicalWidth { 0 };
-    FontBaseline m_baselineType { AlphabeticBaseline }; 
+    FontBaseline m_baselineType { AlphabeticBaseline };
+    bool m_isHorizontal { true };
 };
 

trunk/Source/WebCore/layout/integration/LayoutIntegrationPagination.cpp

@@ -138 +138 @@
             line.baselineType(),
             line.contentLogicalOffset(),
-            line.contentLogicalWidth()
+            line.contentLogicalWidth(),
+            line.isHorizontal()
         };
     };