Changeset 287036 in webkit

Timestamp:

Dec 14, 2021, 11:45:20 AM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Take inline axis direction into account when computing horizontal alignment offset
​https://bugs.webkit.org/show_bug.cgi?id=234286

Reviewed by Antti Koivisto.

This is in preparation for computing the content visual start when text-align is non-initial.

• layout/formattingContexts/inline/InlineLineBoxBuilder.cpp:

(WebCore::Layout::horizontalAlignmentOffset):
(WebCore::Layout::LineBoxBuilder::build):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/formattingContexts/inline/InlineLineBoxBuilder.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-12-14  Alan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Take inline axis direction into account when computing horizontal alignment offset
+        https://bugs.webkit.org/show_bug.cgi?id=234286
+
+        Reviewed by Antti Koivisto.
+
+        This is in preparation for computing the content visual start when text-align is non-initial.
+
+        * layout/formattingContexts/inline/InlineLineBoxBuilder.cpp:
+        (WebCore::Layout::horizontalAlignmentOffset):
+        (WebCore::Layout::LineBoxBuilder::build):
+
 2021-12-11  Dean Jackson  <dino@apple.com>
 

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

@@ -37 +37 @@
 namespace Layout {
 
-static std::optional<InlineLayoutUnit> horizontalAlignmentOffset(TextAlignMode textAlign, const LineBuilder::LineContent& lineContent)
+static std::optional<InlineLayoutUnit> horizontalAlignmentOffset(TextAlignMode textAlign, const LineBuilder::LineContent& lineContent, bool isLeftToRightDirection)
 {
     // Depending on the line’s alignment/justification, the hanging glyph can be placed outside the line box.
@@ -73 +73 @@
     case TextAlignMode::Left:
     case TextAlignMode::WebKitLeft:
+        if (!isLeftToRightDirection)
+            return extraHorizontalSpace;
+        FALLTHROUGH;
     case TextAlignMode::Start:
         return { };
     case TextAlignMode::Right:
     case TextAlignMode::WebKitRight:
+        if (!isLeftToRightDirection)
+            return { };
+        FALLTHROUGH;
     case TextAlignMode::End:
         return extraHorizontalSpace;
@@ -100 +106 @@
 LineBoxBuilder::LineAndLineBox LineBoxBuilder::build(const LineBuilder::LineContent& lineContent, size_t lineIndex)
 {
-    auto textAlign = !lineIndex ? rootBox().firstLineStyle().textAlign() : rootBox().style().textAlign();
-    auto rootInlineBoxAlignmentOffset = Layout::horizontalAlignmentOffset(textAlign, lineContent).value_or(InlineLayoutUnit { });
+    auto& rootStyle = lineIndex ? rootBox().firstLineStyle() : rootBox().style();
+    auto rootInlineBoxAlignmentOffset = Layout::horizontalAlignmentOffset(rootStyle.textAlign(), lineContent, rootStyle.isLeftToRightDirection()).value_or(InlineLayoutUnit { });
     auto lineBox = LineBox { rootBox(), rootInlineBoxAlignmentOffset, lineContent.contentLogicalWidth, lineIndex, lineContent.nonSpanningInlineLevelBoxCount };