commit 96860dea80caa34a5459ccc6609302678e4b9671
author Seigo Nonaka <nona@google.com> Tue Sep 22 23:40:18 2020 -0700
committer Seigo Nonaka <nona@google.com> Mon Oct 12 16:56:58 2020 -0700
tree 23bdefd0a57912ef3b624f3c2365653bb2d022c1
parent 9d6c55961016822bd728af5c13a9a7e23329efef

Call minikin::getBounds instead of using Layout.

This is a 2nd attempt of I3f77d2cc3843ac504c7475c7800f2526b403d933

The bounding box is not necessary for drawing text, so it is
no longer stored in the Layout object. Instead, calculate by
minikin::getBounds function.

Bug: 169114687
Test: atest PaintTest
Test: atest Paint_TextBoundsTest
Change-Id: Ib7c132b1d65369af54b636155c3bdb675415ea55

libs/hwui/jni/Paint.cpp

diff --git a/libs/hwui/jni/Paint.cpp b/libs/hwui/jni/Paint.cpp
index 89ff9b2..3c86b28 100644
--- a/libs/hwui/jni/Paint.cpp
+++ b/libs/hwui/jni/Paint.cpp
@@ -339,18 +339,13 @@
     }
 
     static void doTextBounds(JNIEnv* env, const jchar* text, int count, jobject bounds,
-            const Paint& paint, const Typeface* typeface, jint bidiFlags) {
+            const Paint& paint, const Typeface* typeface, jint bidiFlagsInt) {
         SkRect  r;
         SkIRect ir;
 
-        minikin::Layout layout = MinikinUtils::doLayout(&paint,
-                static_cast<minikin::Bidi>(bidiFlags), typeface,
-                text, count,  // text buffer
-                0, count,  // draw range
-                0, count,  // context range
-                nullptr);
         minikin::MinikinRect rect;
-        layout.getBounds(&rect);
+        minikin::Bidi bidiFlags = static_cast<minikin::Bidi>(bidiFlagsInt);
+        MinikinUtils::getBounds(&paint, bidiFlags, typeface, text, count, &rect);
         r.fLeft = rect.mLeft;
         r.fTop = rect.mTop;
         r.fRight = rect.mRight;