Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Call minikin::getBounds instead of using Layout.""

Browse Source
This commit is contained in:
TreeHugger Robot
2020-10-12 18:07:21 +00:00
committed by Android (Google) Code Review
parent 5d2e6c3cc7 bd4e7fa12c
commit 9d6c559610
3 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libs/hwui/hwui/MinikinUtils.cpp
View File

@@ -21,7 +21,6 @@
#include <log/log.h>
#include <minikin/MeasuredText.h>
#include <minikin/Measurement.h>
#include "Paint.h"
#include "SkPathMeasure.h"
#include "Typeface.h"
@@ -70,18 +69,6 @@ minikin::Layout MinikinUtils::doLayout(const Paint* paint, minikin::Bidi bidiFla
}
}
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) {

3
libs/hwui/hwui/MinikinUtils.h
View File

@@ -48,9 +48,6 @@ public:
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,

11
libs/hwui/jni/Paint.cpp
View File

@@ -339,13 +339,18 @@ namespace PaintGlue {
}
static void doTextBounds(JNIEnv* env, const jchar* text, int count, jobject bounds,
const Paint& paint, const Typeface* typeface, jint bidiFlagsInt) {
const Paint& paint, const Typeface* typeface, jint bidiFlags) {
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;
minikin::Bidi bidiFlags = static_cast<minikin::Bidi>(bidiFlagsInt);
MinikinUtils::getBounds(&paint, bidiFlags, typeface, text, count, &rect);
layout.getBounds(&rect);
r.fLeft = rect.mLeft;
r.fTop = rect.mTop;
r.fRight = rect.mRight;