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
diff --git a/libs/hwui/hwui/MinikinUtils.cpp b/libs/hwui/hwui/MinikinUtils.cpp
index 5f6b53a..b802908 100644
--- a/libs/hwui/hwui/MinikinUtils.cpp
+++ b/libs/hwui/hwui/MinikinUtils.cpp
@@ -21,6 +21,7 @@
#include <log/log.h>
#include <minikin/MeasuredText.h>
+#include <minikin/Measurement.h>
#include "Paint.h"
#include "SkPathMeasure.h"
#include "Typeface.h"
@@ -69,6 +70,18 @@
}
}
+void MinikinUtils::getBounds(const Paint* paint, minikin::Bidi bidiFlags, const Typeface* typeface,
+ const uint16_t* buf, size_t bufSize, minikin::MinikinRect* out) {
+ minikin::MinikinPaint minikinPaint = prepareMinikinPaint(paint, typeface);
+
+ const minikin::U16StringPiece textBuf(buf, bufSize);
+ const minikin::StartHyphenEdit startHyphen = paint->getStartHyphenEdit();
+ const minikin::EndHyphenEdit endHyphen = paint->getEndHyphenEdit();
+
+ minikin::getBounds(textBuf, minikin::Range(0, textBuf.size()), bidiFlags, minikinPaint,
+ startHyphen, endHyphen, out);
+}
+
float MinikinUtils::measureText(const Paint* paint, minikin::Bidi bidiFlags,
const Typeface* typeface, const uint16_t* buf, size_t start,
size_t count, size_t bufSize, float* advances) {
diff --git a/libs/hwui/hwui/MinikinUtils.h b/libs/hwui/hwui/MinikinUtils.h
index 7c3f0d8..a15803a 100644
--- a/libs/hwui/hwui/MinikinUtils.h
+++ b/libs/hwui/hwui/MinikinUtils.h
@@ -48,6 +48,9 @@
size_t contextStart, size_t contextCount,
minikin::MeasuredText* mt);
+ static void getBounds(const Paint* paint, minikin::Bidi bidiFlags, const Typeface* typeface,
+ const uint16_t* buf, size_t bufSize, minikin::MinikinRect* out);
+
static float measureText(const Paint* paint, minikin::Bidi bidiFlags,
const Typeface* typeface, const uint16_t* buf,
size_t start, size_t count, size_t bufSize,
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;