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

diff --git a/Source/WebCore/platform/graphics/android/FontAndroid.cpp b/Source/WebCore/platform/graphics/android/FontAndroid.cpp
index af2edc7..b56e37c 100644 (file)
--- 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