diff options
Diffstat (limited to 'core/jni/android_view_GLES20Canvas.cpp')
-rw-r--r-- | core/jni/android_view_GLES20Canvas.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/jni/android_view_GLES20Canvas.cpp b/core/jni/android_view_GLES20Canvas.cpp index a46ccd6..d032cb6 100644 --- a/core/jni/android_view_GLES20Canvas.cpp +++ b/core/jni/android_view_GLES20Canvas.cpp @@ -656,13 +656,12 @@ public: uirenderer::Rect& bounds) : layout(layout), renderer(renderer), x(x), y(y), paint(paint), glyphs(glyphs), pos(pos), totalAdvance(totalAdvance), bounds(bounds) { } - void operator()(SkTypeface* t, size_t start, size_t end) { + void operator()(size_t start, size_t end) { for (size_t i = start; i < end; i++) { glyphs[i] = layout.getGlyphId(i); pos[2 * i] = layout.getX(i); pos[2 * i + 1] = layout.getY(i); } - paint->setTypeface(t); size_t glyphsCount = end - start; int bytesCount = glyphsCount * sizeof(jchar); renderer->drawText((const char*) (glyphs + start), bytesCount, glyphsCount, @@ -692,7 +691,7 @@ static void renderTextLayout(OpenGLRenderer* renderer, Layout* layout, float totalAdvance = layout->getAdvance(); RenderTextFunctor f(*layout, renderer, x, y, paint, glyphs, pos, totalAdvance, bounds); - MinikinUtils::forFontRun(*layout, f); + MinikinUtils::forFontRun(*layout, paint, f); delete[] glyphs; delete[] pos; } |