Changeset 93221 in webkit

Timestamp:

Aug 17, 2011, 11:07:33 AM (15 years ago)

Author:

rniwa@webkit.org

Message:

An arrow key collapses directionless selection range in the wrong direction in BiDi
​https://bugs.webkit.org/show_bug.cgi?id=64626

Reviewed by Darin Adler.

Source/WebCore:

The bug was caused by willBeModified's always using block direction to determine
the direction to which the selection is collapsed. Fixed the bug by calling directionOfSelection
in willBeModified, which will return the text direction of the surrounding context when
the start and the end have the same direction. When the text directions at the start and at the end
of selection do not match, it uses the block's text direction.

Test: editing/selection/collapse-selection-in-bidi.html

• editing/FrameSelection.cpp:

(WebCore::FrameSelection::directionOfSelection): Added.
(WebCore::FrameSelection::willBeModified): Calls directionOfSelection.
(WebCore::FrameSelection::modifyMovingRight): Ditto.
(WebCore::FrameSelection::modifyMovingLeft): Ditto.

• editing/FrameSelection.h:

LayoutTests:

Added a test to ensure collapsing directionless selection respects the direction of text around
the selection's end points.

• editing/selection/collapse-selection-in-bidi-expected.txt: Added.
• editing/selection/collapse-selection-in-bidi.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/selection/collapse-selection-in-bidi-expected.txt (added)
• LayoutTests/editing/selection/collapse-selection-in-bidi.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/FrameSelection.cpp (modified) (5 diffs)
• Source/WebCore/editing/FrameSelection.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-08-17  Ryosuke Niwa  <rniwa@webkit.org>
+
+        An arrow key collapses directionless selection range in the wrong direction in BiDi
+        https://bugs.webkit.org/show_bug.cgi?id=64626
+
+        Reviewed by Darin Adler.
+
+        Added a test to ensure collapsing directionless selection respects the direction of text around
+        the selection's end points.
+
+        * editing/selection/collapse-selection-in-bidi-expected.txt: Added.
+        * editing/selection/collapse-selection-in-bidi.html: Added.
+
 2011-08-17  Steve Block  <steveblock@google.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-17  Ryosuke Niwa  <rniwa@webkit.org>
+
+        An arrow key collapses directionless selection range in the wrong direction in BiDi
+        https://bugs.webkit.org/show_bug.cgi?id=64626
+
+        Reviewed by Darin Adler.
+
+        The bug was caused by willBeModified's always using block direction to determine
+        the direction to which the selection is collapsed. Fixed the bug by calling directionOfSelection
+        in willBeModified, which will return the text direction of the surrounding context when
+        the start and the end have the same direction. When the text directions at the start and at the end
+        of selection do not match, it uses the block's text direction.
+
+        Test: editing/selection/collapse-selection-in-bidi.html
+
+        * editing/FrameSelection.cpp:
+        (WebCore::FrameSelection::directionOfSelection): Added.
+        (WebCore::FrameSelection::willBeModified): Calls directionOfSelection.
+        (WebCore::FrameSelection::modifyMovingRight): Ditto.
+        (WebCore::FrameSelection::modifyMovingLeft): Ditto.
+        * editing/FrameSelection.h:
+
 2011-08-17  Jeff Miller  <jeffm@apple.com>
 

trunk/Source/WebCore/editing/FrameSelection.cpp

@@ -391 +391 @@
 }
 
+TextDirection FrameSelection::directionOfSelection()
+{
+    InlineBox* startBox = 0;
+    InlineBox* endBox = 0;
+    int unusedOffset;
+    if (m_selection.start().isNotNull())
+        m_selection.visibleStart().getInlineBoxAndOffset(startBox, unusedOffset);
+    if (m_selection.end().isNotNull())
+        m_selection.visibleEnd().getInlineBoxAndOffset(endBox, unusedOffset);
+    if (startBox && endBox && startBox->direction() == endBox->direction())
+        return startBox->direction();
+
+    return directionOfEnclosingBlock();
+}
+
 void FrameSelection::willBeModified(EAlteration alter, SelectionDirection direction)
 {
@@ -412 +427 @@
         switch (direction) {
         case DirectionRight:
-            if (directionOfEnclosingBlock() == LTR)
+            if (directionOfSelection() == LTR)
                 baseIsStart = true;
             else
@@ -421 +436 @@
             break;
         case DirectionLeft:
-            if (directionOfEnclosingBlock() == LTR)
+            if (directionOfSelection() == LTR)
                 baseIsStart = false;
             else
@@ -554 +569 @@
     case CharacterGranularity:
         if (isRange()) {
-            if (directionOfEnclosingBlock() == LTR)
+            if (directionOfSelection() == LTR)
                 pos = VisiblePosition(m_selection.end(), m_selection.affinity());
             else
@@ -725 +740 @@
     case CharacterGranularity:
         if (isRange())
-            if (directionOfEnclosingBlock() == LTR)
+            if (directionOfSelection() == LTR)
                 pos = VisiblePosition(m_selection.start(), m_selection.affinity());
             else

trunk/Source/WebCore/editing/FrameSelection.h

@@ -249 +249 @@
     void respondToNodeModification(Node*, bool baseRemoved, bool extentRemoved, bool startRemoved, bool endRemoved);
     TextDirection directionOfEnclosingBlock();
+    TextDirection directionOfSelection();
 
     VisiblePosition positionForPlatform(bool isGetStart) const;