commit d4bac5eab65f97f56c118c4398e13e5ca395d029
author Raph Levien <raph@google.com> Thu May 15 19:12:47 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 15 19:12:48 2014 +0000
tree f84b6c34182c3cc9c3e6332e209dc26c3e44732c
parent 177cf2155dae43cb8766dd239d34a861d8fba335
parent d93ef9186189c2b521381eb05634298eabe822f8

Merge "Remove SkFloatToScalar in GLES20Canvas (Minikin)"

core/jni/android_view_GLES20Canvas.cpp

diff --git a/core/jni/android_view_GLES20Canvas.cpp b/core/jni/android_view_GLES20Canvas.cpp
index 50eb869..27d3f39 100644
--- a/core/jni/android_view_GLES20Canvas.cpp
+++ b/core/jni/android_view_GLES20Canvas.cpp
@@ -686,8 +686,8 @@
         MinikinFontSkia* mfs = static_cast<MinikinFontSkia *>(layout->getFont(i));
         skFace = mfs->GetSkTypeface();
         glyphs[i] = layout->getGlyphId(i);
-        pos[2 * i] = SkFloatToScalar(layout->getX(i));
-        pos[2 * i + 1] = SkFloatToScalar(layout->getY(i));
+        pos[2 * i] = layout->getX(i);
+        pos[2 * i + 1] = layout->getY(i);
         if (i > 0 && skFace != lastFace) {
             paint->setTypeface(lastFace);
             size_t glyphsCount = i - start;