Title: [179761] branches/safari-600.5-branch/Source/WebCore

Diff

Modified: branches/safari-600.5-branch/Source/WebCore/ChangeLog (179760 => 179761)


--- branches/safari-600.5-branch/Source/WebCore/ChangeLog	2015-02-06 22:05:26 UTC (rev 179760)
+++ branches/safari-600.5-branch/Source/WebCore/ChangeLog	2015-02-06 22:08:05 UTC (rev 179761)
@@ -1,3 +1,22 @@
+2015-02-06  Babak Shafiei  <[email protected]>
+
+        Merge r179758.
+
+    2015-02-06  Timothy Horton  <[email protected]>
+
+            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-01-24  David Kilzer  <[email protected]>
 
         Merge r176262.

Modified: branches/safari-600.5-branch/Source/WebCore/editing/Editor.cpp (179760 => 179761)


--- branches/safari-600.5-branch/Source/WebCore/editing/Editor.cpp	2015-02-06 22:05:26 UTC (rev 179760)
+++ branches/safari-600.5-branch/Source/WebCore/editing/Editor.cpp	2015-02-06 22:08:05 UTC (rev 179761)
@@ -3386,15 +3386,8 @@
     Position start = visibleSelection.start();
     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);
     }
 
     FrameSelection extendedSelection;

Modified: branches/safari-600.5-branch/Source/WebCore/editing/mac/DictionaryLookup.mm (179760 => 179761)


--- branches/safari-600.5-branch/Source/WebCore/editing/mac/DictionaryLookup.mm	2015-02-06 22:05:26 UTC (rev 179760)
+++ branches/safari-600.5-branch/Source/WebCore/editing/mac/DictionaryLookup.mm	2015-02-06 22:08:05 UTC (rev 179761)
@@ -82,15 +82,8 @@
     Position start = position.deepEquivalent();
     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);
     }
 
     return makeRange(start, end);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to