Title: [289710] trunk/Source/WebCore
Revision
289710
Author
[email protected]
Date
2022-02-13 06:53:28 -0800 (Sun, 13 Feb 2022)

Log Message

[LFC][IFC] Add missing bidi vertical adjustment when writing mode is not horizontal
https://bugs.webkit.org/show_bug.cgi?id=236551

Reviewed by Antti Koivisto.

Last 2 missing vertical adjustments.

* layout/formattingContexts/inline/display/InlineDisplayContentBuilder.cpp:
(WebCore::Layout::InlineDisplayContentBuilder::processBidiContent):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (289709 => 289710)


--- trunk/Source/WebCore/ChangeLog	2022-02-13 14:48:03 UTC (rev 289709)
+++ trunk/Source/WebCore/ChangeLog	2022-02-13 14:53:28 UTC (rev 289710)
@@ -1,5 +1,17 @@
 2022-02-13  Alan Bujtas  <[email protected]>
 
+        [LFC][IFC] Add missing bidi vertical adjustment when writing mode is not horizontal
+        https://bugs.webkit.org/show_bug.cgi?id=236551
+
+        Reviewed by Antti Koivisto.
+
+        Last 2 missing vertical adjustments.
+
+        * layout/formattingContexts/inline/display/InlineDisplayContentBuilder.cpp:
+        (WebCore::Layout::InlineDisplayContentBuilder::processBidiContent):
+
+2022-02-13  Alan Bujtas  <[email protected]>
+
         [LFC][IFC] Baseline value is always logical
         https://bugs.webkit.org/show_bug.cgi?id=236549
 

Modified: trunk/Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayContentBuilder.cpp (289709 => 289710)


--- trunk/Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayContentBuilder.cpp	2022-02-13 14:48:03 UTC (rev 289709)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayContentBuilder.cpp	2022-02-13 14:53:28 UTC (rev 289710)
@@ -582,7 +582,7 @@
                 auto visualRect = visualRectRelativeToRoot(logicalRect);
                 auto wordSpacingMargin = lineRun.isWordSeparator() ? layoutBox.style().fontCascade().wordSpacing() : 0.0f;
 
-                visualRect.moveHorizontally(wordSpacingMargin);
+                isHorizontalWritingMode ? visualRect.moveHorizontally(wordSpacingMargin) : visualRect.moveVertically(wordSpacingMargin);
                 appendTextDisplayBox(lineRun, visualRect, boxes);
                 contentRightInInlineDirectionVisualOrder += logicalRect.width() + wordSpacingMargin;
                 displayBoxTree.append(parentDisplayBoxNodeIndex, boxes.size() - 1);
@@ -609,7 +609,7 @@
 
                 auto isLeftToRightDirection = layoutBox.parent().style().isLeftToRightDirection();
                 auto boxMarginLeft = marginLeftInInlineDirection(boxGeometry, isLeftToRightDirection);
-                visualRect.moveHorizontally(boxMarginLeft);
+                isHorizontalWritingMode ? visualRect.moveHorizontally(boxMarginLeft) : visualRect.moveVertically(boxMarginLeft);
                 appendAtomicInlineLevelDisplayBox(lineRun, visualRect, boxes);
                 contentRightInInlineDirectionVisualOrder += boxMarginLeft + logicalRect.width() + marginRightInInlineDirection(boxGeometry, isLeftToRightDirection);
                 displayBoxTree.append(parentDisplayBoxNodeIndex, boxes.size() - 1);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to