Changeset 109984 in webkit

Timestamp:

Mar 6, 2012 5:13:54 PM (12 years ago)

Author:

rniwa@webkit.org

Message:

Can't select a line of RTL text on Facebook
​https://bugs.webkit.org/show_bug.cgi?id=59435

Reviewed by Eric Seidel.

Source/WebCore:

Deploy prevLeafChildIgnoringLineBreak and nextLeafChildIgnoringLineBreak
in RenderedPosition::leftBoundaryOfBidiRun and RenderedPosition::rightBoundaryOfBidiRun.

Without this patch, WebKit extends selection from right to left when the user selects
<span dir="rtl">ABC<br></span> from left to right by a mouse drag.

Test: editing/selection/select-bidi-run.html

• editing/RenderedPosition.cpp:

(WebCore::RenderedPosition::leftBoundaryOfBidiRun):
(WebCore::RenderedPosition::rightBoundaryOfBidiRun):

LayoutTests:

Added a regression test case.

• editing/selection/select-bidi-run-expected.txt:
• editing/selection/select-bidi-run.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/selection/select-bidi-run-expected.txt (modified) (1 diff)
• LayoutTests/editing/selection/select-bidi-run.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/RenderedPosition.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-03-06  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Can't select a line of RTL text on Facebook
+        https://bugs.webkit.org/show_bug.cgi?id=59435
+
+        Reviewed by Eric Seidel.
+
+        Added a regression test case.
+
+        * editing/selection/select-bidi-run-expected.txt:
+        * editing/selection/select-bidi-run.html:
+
 2012-03-06  Adrienne Walker  <enne@google.com>
 

trunk/LayoutTests/editing/selection/select-bidi-run-expected.txt

@@ -123 +123 @@
 PASS selected "ABC"
 
+Test "ABC" in "ABC":
+Selecting from left to right
+PASS selected "C"
+PASS selected "BC"
+PASS selected "ABC"
+Selecting from right to left
+PASS selected "A"
+PASS selected "AB"
+PASS selected "ABC"
+
 PASS successfullyParsed is true
 

trunk/LayoutTests/editing/selection/select-bidi-run.html

@@ -47 +47 @@
 
 <dt contenteditable style="position: relative;">aאבגb<div class="targetContainer">a<span class="target">אבג</span>b</div></dt>
+<dd>C,BC,ABC|A,AB,ABC</dd>
+
+<dt contenteditable dir="ltr"><span class="target" dir="rtl">אבג<br></span></dt>
 <dd>C,BC,ABC|A,AB,ABC</dd>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-06  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Can't select a line of RTL text on Facebook
+        https://bugs.webkit.org/show_bug.cgi?id=59435
+
+        Reviewed by Eric Seidel.
+
+        Deploy prevLeafChildIgnoringLineBreak and nextLeafChildIgnoringLineBreak
+        in RenderedPosition::leftBoundaryOfBidiRun and RenderedPosition::rightBoundaryOfBidiRun.
+
+        Without this patch, WebKit extends selection from right to left when the user selects
+        <span dir="rtl">ABC<br></span> from left to right by a mouse drag.
+
+        Test: editing/selection/select-bidi-run.html
+
+        * editing/RenderedPosition.cpp:
+        (WebCore::RenderedPosition::leftBoundaryOfBidiRun):
+        (WebCore::RenderedPosition::rightBoundaryOfBidiRun):
+
 2012-03-06  Raphael Kubo da Costa  <kubo@profusion.mobi>
 

trunk/Source/WebCore/editing/RenderedPosition.cpp

@@ -138 +138 @@
     InlineBox* box = m_inlineBox;
     do {
-        InlineBox* prev = box->prevLeafChild();
+        InlineBox* prev = box->prevLeafChildIgnoringLineBreak();
         if (!prev || prev->bidiLevel() < bidiLevelOfRun)
             return RenderedPosition(box->renderer(), box, box->caretLeftmostOffset());
@@ -155 +155 @@
     InlineBox* box = m_inlineBox;
     do {
-        InlineBox* next = box->nextLeafChild();
+        InlineBox* next = box->nextLeafChildIgnoringLineBreak();
         if (!next || next->bidiLevel() < bidiLevelOfRun)
             return RenderedPosition(box->renderer(), box, box->caretRightmostOffset());