summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Fabrice Di Meglio <fdimeglio@google.com> 2011-11-02 02:17:48 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2011-11-02 02:17:48 +0000
commit07b4b3145333bc8ece9fdbb68ade726b3d6485cd (patch)
tree0c469984825d2d8544134837be720e86e7d13aa0
parentad41a94b298f834e13632ee29b27cefd75f10012 (diff)
parentbcf05a69090f342d328f1537d1d83406b883290b (diff)
am bcf05a69: Fix bug #5553401 TextLayoutCache is too verbose: "computeValuesWithHarfbuzz -- need to force to single run"
* commit 'bcf05a69090f342d328f1537d1d83406b883290b': Fix bug #5553401 TextLayoutCache is too verbose: "computeValuesWithHarfbuzz -- need to force to single run"
-rw-r--r--core/jni/android/graphics/TextLayoutCache.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/core/jni/android/graphics/TextLayoutCache.cpp b/core/jni/android/graphics/TextLayoutCache.cpp
index 8ee1d8b52841..79aa43b2f90c 100644
--- a/core/jni/android/graphics/TextLayoutCache.cpp
+++ b/core/jni/android/graphics/TextLayoutCache.cpp
@@ -444,7 +444,11 @@ void TextLayoutCacheValue::computeValuesWithHarfbuzz(SkPaint* paint, const UChar
LOGD("computeValuesWithHarfbuzz -- dirFlags=%d run-count=%d paraDir=%d",
dirFlags, rc, paraDir);
#endif
- if (!U_SUCCESS(status) || rc <= 1) {
+ if (U_SUCCESS(status) && rc == 1) {
+ // Normal case: one run, status is ok
+ isRTL = (paraDir == 1);
+ useSingleRun = true;
+ } else if (!U_SUCCESS(status) || rc < 1) {
LOGW("computeValuesWithHarfbuzz -- need to force to single run");
isRTL = (paraDir == 1);
useSingleRun = true;