Changeset 74971 in webkit

Timestamp:

Jan 4, 2011 9:21:13 AM (13 years ago)

Author:

rniwa@webkit.org

Message:

2011-01-04 Ryosuke Niwa <​rniwa@webkit.org>

Reviewed by Dan Bernstein.

Clicking on the first or the last letter of LTR/RTL text in a RTL/LTR block puts caret on the opposite side.
​https://bugs.webkit.org/show_bug.cgi?id=50992

Fixed the bug by interchanging the offset when the direction of inline text box and the containing block
does not match. Reused the code added by ​http://trac.webkit.org/changeset/73553.

Test: editing/selection/caret-bidi-first-and-last-letters.html

• rendering/InlineTextBox.cpp: (WebCore::InlineTextBox::offsetForPosition):

2011-01-04 Ryosuke Niwa <​rniwa@webkit.org>

Reviewed by Dan Bernstein.

Clicking on the first or the last letter of LTR/RTL text in a RTL/LTR block puts caret on the opposite side.
​https://bugs.webkit.org/show_bug.cgi?id=50992

Added a test to ensure WebKit places the caret on the side user clicked even when text's natural direction
and the containing block's direction do not match.

• editing/selection/caret-bidi-first-and-last-letters-expected.txt: Added.
• editing/selection/caret-bidi-first-and-last-letters.html: Added.
• editing/selection/resources/caret-edge-shared.js: Avoid calling verify() outside of DRT.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/selection/caret-bidi-first-and-last-letters-expected.txt (added)
• LayoutTests/editing/selection/caret-bidi-first-and-last-letters.html (added)
• LayoutTests/editing/selection/resources/caret-edge-shared.js (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/InlineTextBox.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-01-04  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Reviewed by Dan Bernstein.
+
+        Clicking on the first or the last letter of LTR/RTL text in a RTL/LTR block puts caret on the opposite side.
+        https://bugs.webkit.org/show_bug.cgi?id=50992
+
+        Added a test to ensure WebKit places the caret on the side user clicked even when text's natural direction
+        and the containing block's direction do not match.
+
+        * editing/selection/caret-bidi-first-and-last-letters-expected.txt: Added.
+        * editing/selection/caret-bidi-first-and-last-letters.html: Added.
+        * editing/selection/resources/caret-edge-shared.js: Avoid calling verify() outside of DRT.
+
 2011-01-04  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/LayoutTests/editing/selection/resources/caret-edge-shared.js

@@ -3 +3 @@
     var div = document.getElementsByTagName('div')[0];
 
-    if (!window.layoutTestController) {
-        div.addEventListener('mouseup', verify);
+    if (!window.layoutTestController)
         return;
-    }
 
     if (clickOn == 'left')

trunk/WebCore/ChangeLog

@@ +1 @@
+2011-01-04  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Reviewed by Dan Bernstein.
+
+        Clicking on the first or the last letter of LTR/RTL text in a RTL/LTR block puts caret on the opposite side.
+        https://bugs.webkit.org/show_bug.cgi?id=50992
+
+        Fixed the bug by interchanging the offset when the direction of inline text box and the containing block
+        does not match. Reused the code added by http://trac.webkit.org/changeset/73553.
+
+        Test: editing/selection/caret-bidi-first-and-last-letters.html
+
+        * rendering/InlineTextBox.cpp:
+        (WebCore::InlineTextBox::offsetForPosition):
+
 2010-12-29  Tony Gentilcore  <tonyg@chromium.org>
 

trunk/WebCore/rendering/InlineTextBox.cpp

@@ -1148 +1148 @@
     int leftOffset = isLeftToRightDirection() ? 0 : m_len;
     int rightOffset = isLeftToRightDirection() ? m_len : 0;
-    if (renderer()->containingBlock()->style()->isLeftToRightDirection() != isLeftToRightDirection())
+    bool blockIsInOppositeDirection = renderer()->containingBlock()->style()->isLeftToRightDirection() != isLeftToRightDirection();
+    if (blockIsInOppositeDirection)
         swap(leftOffset, rightOffset);
 
@@ -1159 +1160 @@
     RenderStyle* style = text->style(m_firstLine);
     const Font* f = &style->font();
-    return f->offsetForPosition(TextRun(textRenderer()->text()->characters() + m_start, m_len, textRenderer()->allowTabs(), textPos(), m_toAdd, !isLeftToRightDirection(), m_dirOverride || style->visuallyOrdered()),
+    int offset = f->offsetForPosition(TextRun(textRenderer()->text()->characters() + m_start, m_len,
+        textRenderer()->allowTabs(), textPos(), m_toAdd, !isLeftToRightDirection(), m_dirOverride || style->visuallyOrdered()),
         lineOffset - logicalLeft(), includePartialGlyphs);
+    if (blockIsInOppositeDirection && (!offset || offset == m_len))
+        return !offset ? m_len : 0;
+    return offset;
 }