From 8fb507171f68d4170cfeb1187ee7d1f70f98917d Mon Sep 17 00:00:00 2001 From: Fabrice Di Meglio Date: Fri, 13 May 2011 18:51:21 -0700 Subject: [PATCH] Fix bug #4415576 Gmail text looks broken - pass correct "contextCount" when needed Change-Id: I56ebd9486e99e6ca5a3973ec403cf1ced874b4c3 --- core/jni/android/graphics/Canvas.cpp | 2 +- core/jni/android/graphics/Paint.cpp | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/core/jni/android/graphics/Canvas.cpp b/core/jni/android/graphics/Canvas.cpp index 2dceab9b4007d..d9e2c95169b88 100644 --- a/core/jni/android/graphics/Canvas.cpp +++ b/core/jni/android/graphics/Canvas.cpp @@ -777,7 +777,7 @@ public: jint count = end - start; sp value = gTextLayoutCache.getValue( - paint, textArray, start, count, count, flags); + paint, textArray, start, count, end, flags); if (value == NULL) { LOGE("drawTextWithGlyphs -- cannot get Cache value"); return ; diff --git a/core/jni/android/graphics/Paint.cpp b/core/jni/android/graphics/Paint.cpp index 768b836b24388..64749e98087f6 100644 --- a/core/jni/android/graphics/Paint.cpp +++ b/core/jni/android/graphics/Paint.cpp @@ -335,8 +335,8 @@ public: const jchar* textArray = env->GetCharArrayElements(text, NULL); jfloat result = 0; #if RTL_USE_HARFBUZZ - TextLayout::getTextRunAdvances(paint, textArray, index, count, count, paint->getFlags(), - NULL /* dont need all advances */, result); + TextLayout::getTextRunAdvances(paint, textArray, index, count, textLength, + paint->getFlags(), NULL /* dont need all advances */, result); #else // we double count, since measureText wants a byteLength SkScalar width = paint->measureText(textArray + index, count << 1); @@ -362,8 +362,8 @@ public: jfloat width = 0; #if RTL_USE_HARFBUZZ - TextLayout::getTextRunAdvances(paint, textArray, 0, count, count, paint->getFlags(), - NULL /* dont need all advances */, width); + TextLayout::getTextRunAdvances(paint, textArray, start, count, end, + paint->getFlags(), NULL /* dont need all advances */, width); #else width = SkScalarToFloat(paint->measureText(textArray + start, count << 1)); @@ -381,8 +381,8 @@ public: size_t textLength = env->GetStringLength(text); jfloat width = 0; #if RTL_USE_HARFBUZZ - TextLayout::getTextRunAdvances(paint, textArray, 0, textLength, textLength, paint->getFlags(), - NULL /* dont need all advances */, width); + TextLayout::getTextRunAdvances(paint, textArray, 0, textLength, textLength, + paint->getFlags(), NULL /* dont need all advances */, width); #else width = SkScalarToFloat(paint->measureText(textArray, textLength << 1)); #endif @@ -396,8 +396,8 @@ public: #if RTL_USE_HARFBUZZ jfloat totalAdvance; - TextLayout::getTextRunAdvances(paint, text, 0, count, count, paint->getFlags(), - widthsArray, totalAdvance); + TextLayout::getTextRunAdvances(paint, text, 0, count, count, + paint->getFlags(), widthsArray, totalAdvance); #else SkScalar* scalarArray = (SkScalar*)widthsArray;