Changeset 210831 in webkit

Timestamp:

Jan 17, 2017, 4:02:42 PM (9 years ago)

Author:

Alan Bujtas

Message:

Editing nested RTL-LTR content makes the process unresponsive.
​https://bugs.webkit.org/show_bug.cgi?id=167140
rdar://problem/29057611

Reviewed by Ryosuke Niwa.

Source/WebCore:

Break out of the loop if we keep coming back to the same position.
This is a workaround for the underlying editing/position bug -> webkit.org/b/167138.

Test: editing/rtl-to-ltr-editing-word-move-spin.html

• editing/VisibleUnits.cpp:

(WebCore::visualWordPosition):

LayoutTests:

• editing/rtl-to-ltr-editing-word-move-spin-expected.txt: Added.
• editing/rtl-to-ltr-editing-word-move-spin.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/rtl-to-ltr-editing-word-move-spin-expected.txt (added)
• LayoutTests/editing/rtl-to-ltr-editing-word-move-spin.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/VisibleUnits.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-01-17  Zalan Bujtas  <zalan@apple.com>
+
+        Editing nested RTL-LTR content makes the process unresponsive.
+        https://bugs.webkit.org/show_bug.cgi?id=167140
+        rdar://problem/29057611
+
+        Reviewed by Ryosuke Niwa.
+
+        * editing/rtl-to-ltr-editing-word-move-spin-expected.txt: Added.
+        * editing/rtl-to-ltr-editing-word-move-spin.html: Added.
+
 2017-01-17  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-01-17  Zalan Bujtas  <zalan@apple.com>
+
+        Editing nested RTL-LTR content makes the process unresponsive.
+        https://bugs.webkit.org/show_bug.cgi?id=167140
+        rdar://problem/29057611
+
+        Reviewed by Ryosuke Niwa.
+
+        Break out of the loop if we keep coming back to the same position.
+        This is a workaround for the underlying editing/position bug -> webkit.org/b/167138.
+
+        Test: editing/rtl-to-ltr-editing-word-move-spin.html
+
+        * editing/VisibleUnits.cpp:
+        (WebCore::visualWordPosition):
+
 2017-01-16  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/WebCore/editing/VisibleUnits.cpp

@@ -353 +353 @@
     InlineBox* previouslyVisitedBox = nullptr;
     VisiblePosition current = visiblePosition;
+    std::optional<VisiblePosition> previousPosition;
     UBreakIterator* iter = nullptr;
 
@@ -361 +362 @@
         VisiblePosition adjacentCharacterPosition = direction == MoveRight ? current.right(true) : current.left(true); 
         if (adjacentCharacterPosition == current || adjacentCharacterPosition.isNull())
+            return VisiblePosition();
+        // FIXME: This is a workaround for webkit.org/b/167138.
+        if (previousPosition && adjacentCharacterPosition == previousPosition.value())
             return VisiblePosition();
     
@@ -410 +414 @@
             return adjacentCharacterPosition;
     
+        previousPosition = current;
         current = adjacentCharacterPosition;
     }