Unexpected overlapping selection with tab in RTL context.

alanbaradlay · alanbaradlay · commit 6361a69741b7 · 2023-01-26T16:52:02.000-08:00
https://bugs.webkit.org/show_bug.cgi?id=251169 Reviewed by Antti Koivisto. In order to get the correct advanced width at selection paint time we need to pass in the "logical horizontal position" (the value we used at layout). * LayoutTests/fast/repaint/rtl-with-position-dependent-content-width-selection-expected.txt: Added. * LayoutTests/fast/repaint/rtl-with-position-dependent-content-width-selection.html: Added. * Source/WebCore/layout/integration/inline/InlineIteratorBoxModernPath.h: (WebCore::InlineIterator::BoxModernPath::textRun const): Canonical link: https://commits.webkit.org/259460@main
diff --git a/LayoutTests/fast/repaint/rtl-with-position-dependent-content-width-selection-expected.txt b/LayoutTests/fast/repaint/rtl-with-position-dependent-content-width-selection-expected.txt
@@ -0,0 +1,5 @@
+	X
+(repaint rects
+  (rect 8 8 109 46)
+)
+
diff --git a/LayoutTests/fast/repaint/rtl-with-position-dependent-content-width-selection.html b/LayoutTests/fast/repaint/rtl-with-position-dependent-content-width-selection.html
@@ -0,0 +1,40 @@
+<style>
+div {
+  direction: rtl;
+  white-space: pre;
+  font-size: 40px;
+  float: left;
+}
+</style>
+<div id=select_this>	X</div>
+<script src="../../resources/ui-helper.js"></script>
+<script>
+if (window.testRunner) {
+  testRunner.dumpAsText();
+  testRunner.waitUntilDone();
+}
+
+async function repaintTest() {
+  if (window.internals)
+    internals.startTrackingRepaints();
+
+  let range = document.createRange();
+  range.selectNodeContents(select_this);  
+  window.getSelection().addRange(range);
+
+  await UIHelper.renderingUpdate();
+ 
+  if (window.internals) {
+    var repaintRects = internals.repaintRectsAsText();
+    internals.stopTrackingRepaints();
+    var pre = document.createElement('pre');
+    document.body.appendChild(pre);
+    pre.innerHTML = repaintRects;
+  }
+
+  if (window.testRunner)
+    testRunner.notifyDone();
+}
+setTimeout(repaintTest, 0);
+
+</script>
diff --git a/Source/WebCore/layout/integration/inline/InlineIteratorBoxModernPath.h b/Source/WebCore/layout/integration/inline/InlineIteratorBoxModernPath.h
@@ -92,10 +92,13 @@ class BoxModernPath {
     {
         auto& style = box().style();
         auto expansion = box().expansion();
-        auto rect = this->visualRectIgnoringBlockDirection();
-        auto xPos = rect.x() - (line().lineBoxLeft() + line().contentLogicalLeftIgnoringInlineDirection());
+        auto logicalLeft = [&] {
+            if (style.isLeftToRightDirection())
+                return visualRectIgnoringBlockDirection().x() - (line().lineBoxLeft() + line().contentLogicalLeft());
+            return line().lineBoxRight() - (visualRectIgnoringBlockDirection().maxX() + line().contentLogicalLeft());
+        };
         auto characterScanForCodePath = isText() && !renderText().canUseSimpleFontCodePath();
-        auto textRun = TextRun { mode == TextRunMode::Editing ? originalText() : box().text()->renderedContent(), xPos, expansion.horizontalExpansion, expansion.behavior, direction(), style.rtlOrdering() == Order::Visual, characterScanForCodePath };
+        auto textRun = TextRun { mode == TextRunMode::Editing ? originalText() : box().text()->renderedContent(), logicalLeft(), expansion.horizontalExpansion, expansion.behavior, direction(), style.rtlOrdering() == Order::Visual, characterScanForCodePath };
         textRun.setTabSize(!style.collapseWhiteSpace(), style.tabSize());
         return textRun;
     };

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +	X
 +(repaint rects
 +  (rect 8 8 109 46)
 +)
++