summaryrefslogtreecommitdiffstats
path: root/Source/WebCore
diff options
context:
space:
mode:
authorRussell Brenner <russellbrenner@google.com>2012-03-16 15:53:32 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-03-16 15:53:32 -0700
commit28b076dbd55a7045ac661ea6bb92ce54291c6ed7 (patch)
tree31bbb28b043cc7f26737163b79d1621771587989 /Source/WebCore
parentedb4c821a774785547f65460c5be254734deb93e (diff)
parentb327374e1be9171551a5545ed2ab87e79a36ed7a (diff)
downloadexternal_webkit-28b076dbd55a7045ac661ea6bb92ce54291c6ed7.zip
external_webkit-28b076dbd55a7045ac661ea6bb92ce54291c6ed7.tar.gz
external_webkit-28b076dbd55a7045ac661ea6bb92ce54291c6ed7.tar.bz2
Merge "Fix selection positioning for RTL languages"
Diffstat (limited to 'Source/WebCore')
-rw-r--r--Source/WebCore/platform/graphics/android/FontAndroid.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/platform/graphics/android/FontAndroid.cpp b/Source/WebCore/platform/graphics/android/FontAndroid.cpp
index ef7740c..6ae839b 100644
--- a/Source/WebCore/platform/graphics/android/FontAndroid.cpp
+++ b/Source/WebCore/platform/graphics/android/FontAndroid.cpp
@@ -1003,14 +1003,14 @@ FloatRect Font::selectionRectForComplexText(const TextRun& run,
int glyph = walker.logClusters()[from];
fromX = base + walker.positions()[glyph].x();
fromAdvance = walker.advances()[glyph];
- } else
+ } else if (!walker.rtl())
from -= numCodePoints;
if (toX == -1 && to < numCodePoints) {
int glyph = walker.logClusters()[to];
toX = base + walker.positions()[glyph].x();
toAdvance = walker.advances()[glyph];
- } else
+ } else if (!walker.rtl())
to -= numCodePoints;
if (!walker.rtl())