Changeset 137213 in webkit

Timestamp:

Dec 10, 2012, 3:30:36 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Keyboard caret movement in textarea with RTL Override Character can make tab unresponsive
​https://bugs.webkit.org/show_bug.cgi?id=103067

Patch by Yi Shen <​max.hong.shen@gmail.com> on 2012-12-10
Reviewed by Ryosuke Niwa.

Source/WebCore:

For textarea with RTL override character, the line break could be the previous leaf InlineTextBox of
the InlineTextBox for the RTL override text. When overshots the left/right, make sure the
leftVisuallyDistinctCandidate and rightVisuallyDistinctCandidate return the visually distinct
left/right position by ignoring the line break.

Test: editing/selection/move-by-character-crash-test-textarea.html

• editing/VisiblePosition.cpp:

(WebCore::VisiblePosition::leftVisuallyDistinctCandidate):
(WebCore::VisiblePosition::rightVisuallyDistinctCandidate):

LayoutTests:

New test for moving caret in textarea with RTL override character causes crash.

• editing/selection/move-by-character-crash-test-textarea-expected.txt: Added.
• editing/selection/move-by-character-crash-test-textarea.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/selection/move-by-character-crash-test-textarea-expected.txt (added)
• LayoutTests/editing/selection/move-by-character-crash-test-textarea.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/VisiblePosition.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-12-10  Yi Shen  <max.hong.shen@gmail.com>
+
+        Keyboard caret movement in textarea with RTL Override Character can make tab unresponsive
+        https://bugs.webkit.org/show_bug.cgi?id=103067
+
+        Reviewed by Ryosuke Niwa.
+
+        New test for moving caret in textarea with RTL override character causes crash.
+
+        * editing/selection/move-by-character-crash-test-textarea-expected.txt: Added.
+        * editing/selection/move-by-character-crash-test-textarea.html: Added.
+
 2012-12-10  Dirk Pranke  <dpranke@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-12-10  Yi Shen  <max.hong.shen@gmail.com>
+
+        Keyboard caret movement in textarea with RTL Override Character can make tab unresponsive
+        https://bugs.webkit.org/show_bug.cgi?id=103067
+
+        Reviewed by Ryosuke Niwa.
+
+        For textarea with RTL override character, the line break could be the previous leaf InlineTextBox of
+        the InlineTextBox for the RTL override text. When overshots the left/right, make sure the 
+        leftVisuallyDistinctCandidate and rightVisuallyDistinctCandidate return the visually distinct 
+        left/right position by ignoring the line break.
+
+        Test: editing/selection/move-by-character-crash-test-textarea.html
+
+        * editing/VisiblePosition.cpp:
+        (WebCore::VisiblePosition::leftVisuallyDistinctCandidate):
+        (WebCore::VisiblePosition::rightVisuallyDistinctCandidate):
+
 2012-12-10  Kondapally Kalyan  <kalyan.kondapally@intel.com>
 

trunk/Source/WebCore/editing/VisiblePosition.cpp

@@ -146 +146 @@
             if (box->isLeftToRightDirection() ? offset < caretMinOffset : offset > caretMaxOffset) {
                 // Overshot to the left.
-                InlineBox* prevBox = box->prevLeafChild();
+                InlineBox* prevBox = box->prevLeafChildIgnoringLineBreak();
                 if (!prevBox) {
                     Position positionOnLeft = primaryDirection == LTR ? previousVisuallyDistinctCandidate(m_deepPosition) : nextVisuallyDistinctCandidate(m_deepPosition);
@@ -311 +311 @@
             if (box->isLeftToRightDirection() ? offset > caretMaxOffset : offset < caretMinOffset) {
                 // Overshot to the right.
-                InlineBox* nextBox = box->nextLeafChild();
+                InlineBox* nextBox = box->nextLeafChildIgnoringLineBreak();
                 if (!nextBox) {
                     Position positionOnRight = primaryDirection == LTR ? nextVisuallyDistinctCandidate(m_deepPosition) : previousVisuallyDistinctCandidate(m_deepPosition);