summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabrice Di Meglio <fdimeglio@google.com>2011-11-01 17:53:34 -0700
committerFabrice Di Meglio <fdimeglio@google.com>2011-11-01 17:58:00 -0700
commitbcf05a69090f342d328f1537d1d83406b883290b (patch)
tree7176f5370f06fc0acd37aa8004475169f08f53f8
parentd5b25ecc07efb9d7f725731f29241217266b4c0c (diff)
downloadbase-bcf05a69090f342d328f1537d1d83406b883290b.tar.gz
Fix bug #5553401 TextLayoutCache is too verbose: "computeValuesWithHarfbuzz -- need to force to single run"
- make single run case non verbose Change-Id: I5c3b87aeb613697233290ddecac3ca00f58f8313
-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 3fdc79b3a90a..7db8abd39d68 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;