Changeset 179760 in webkit

Timestamp:

Feb 6, 2015, 2:05:26 PM (12 years ago)

Author:

bshafiei@apple.com

Message:

Merged r179758. rdar://problem/19738407

Location:

branches/safari-600.4-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/Editor.cpp (modified) (1 diff)
• editing/mac/DictionaryLookup.mm (modified) (1 diff)

branches/safari-600.4-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2015-02-06  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r179758.
+
+    2015-02-06  Timothy Horton  <timothy_horton@apple.com>
+
+            REGRESSION: Lookup doesn't work in RTL
+            https://bugs.webkit.org/show_bug.cgi?id=141338
+            <rdar://problem/19738407>
+
+            Reviewed by Dan Bernstein.
+
+            * editing/Editor.cpp:
+            (WebCore::Editor::scanSelectionForTelephoneNumbers):
+            * editing/mac/DictionaryLookup.mm:
+            (WebCore::rangeExpandedAroundPositionByCharacters):
+            Positions are independent of writing direction, so we don't
+            need to (and shouldn't) do anything special for RTL here.
+
 2015-02-03  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-600.4-branch/Source/WebCore/editing/Editor.cpp

@@ -3383 +3383 @@
     Position end = visibleSelection.end();
     for (int i = 0; i < charactersToExtend; ++i) {
-        if (directionOfEnclosingBlock(start) == LTR)
-            start = start.previous(Character);
-        else
-            start = start.next(Character);
-
-        if (directionOfEnclosingBlock(end) == LTR)
-            end = end.next(Character);
-        else
-            end = end.previous(Character);
+        start = start.previous(Character);
+        end = end.next(Character);
     }
 

branches/safari-600.4-branch/Source/WebCore/editing/mac/DictionaryLookup.mm

@@ -83 +83 @@
     Position end = position.deepEquivalent();
     for (int i = 0; i < numberOfCharactersToExpand; ++i) {
-        if (directionOfEnclosingBlock(start) == LTR)
-            start = start.previous(Character);
-        else
-            start = start.next(Character);
-
-        if (directionOfEnclosingBlock(end) == LTR)
-            end = end.next(Character);
-        else
-            end = end.previous(Character);
+        start = start.previous(Character);
+        end = end.next(Character);
     }