summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/graphics/android/FontAndroid.cpp
diff options
context:
space:
mode:
authorRussell Brenner <russellbrenner@google.com>2011-07-25 16:25:38 -0700
committerRussell Brenner <russellbrenner@google.com>2011-07-27 13:29:28 -0700
commit14a561b2c1a0d30c36751ea756c773d70c9c4d76 (patch)
treef7c7596b129d3012a0f7c0d89f9c519ab835dd0a /Source/WebCore/platform/graphics/android/FontAndroid.cpp
parent5ac09d6c0c76e5408a4665034b9e9395e7fa1d29 (diff)
downloadexternal_webkit-14a561b2c1a0d30c36751ea756c773d70c9c4d76.zip
external_webkit-14a561b2c1a0d30c36751ea756c773d70c9c4d76.tar.gz
external_webkit-14a561b2c1a0d30c36751ea756c773d70c9c4d76.tar.bz2
Fix for Devanagari diacritical marks
It appears that offsetX and advance were at odds with each other. Eliminating offsetX causes the diacritical marks to be positioned correctly. Bug: 4309954 Change-Id: I51fbdd4523ba7de1a2d981b971fdd4f1d42b979c
Diffstat (limited to 'Source/WebCore/platform/graphics/android/FontAndroid.cpp')
-rw-r--r--Source/WebCore/platform/graphics/android/FontAndroid.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/WebCore/platform/graphics/android/FontAndroid.cpp b/Source/WebCore/platform/graphics/android/FontAndroid.cpp
index af2edc7..b56e37c 100644
--- a/Source/WebCore/platform/graphics/android/FontAndroid.cpp
+++ b/Source/WebCore/platform/graphics/android/FontAndroid.cpp
@@ -717,8 +717,7 @@ void TextRunWalker::setGlyphXPositions(bool isRTL)
int i = isRTL ? m_item.num_glyphs - iter - 1 : iter;
m_glyphs16[i] = m_item.glyphs[i];
- int offsetX = truncateFixedPointToInteger(m_item.offsets[i].x);
- m_xPositions[i] = SkIntToScalar(m_offsetX + position + offsetX);
+ m_xPositions[i] = SkIntToScalar(m_offsetX + position);
int advance = truncateFixedPointToInteger(m_item.advances[i]);
// The first half of the conjunction works around the case where