Substitute SkFontMetrics for paint::FontMetrics. (f8c14ce6) · Commits · e / os / android_frameworks_base

core/jni/android/graphics/Paint.cpp

+7 −7

Original line number	Original line	Diff line number	Diff line
	@@ -577,7 +577,7 @@ namespace PaintGlue {
	}		}
	}		}

	static SkScalar getMetricsInternal(jlong paintHandle, Paint::FontMetrics *metrics) {		static SkScalar getMetricsInternal(jlong paintHandle, SkFontMetrics *metrics) {
	const int kElegantTop = 2500;		const int kElegantTop = 2500;
	const int kElegantBottom = -1000;		const int kElegantBottom = -1000;
	const int kElegantAscent = 1900;		const int kElegantAscent = 1900;
	@@ -609,7 +609,7 @@ namespace PaintGlue {
	}		}

	static jfloat getFontMetrics(JNIEnv* env, jobject, jlong paintHandle, jobject metricsObj) {		static jfloat getFontMetrics(JNIEnv* env, jobject, jlong paintHandle, jobject metricsObj) {
	Paint::FontMetrics metrics;		SkFontMetrics metrics;
	SkScalar spacing = getMetricsInternal(paintHandle, &metrics);		SkScalar spacing = getMetricsInternal(paintHandle, &metrics);

	if (metricsObj) {		if (metricsObj) {
	@@ -624,7 +624,7 @@ namespace PaintGlue {
	}		}

	static jint getFontMetricsInt(JNIEnv* env, jobject, jlong paintHandle, jobject metricsObj) {		static jint getFontMetricsInt(JNIEnv* env, jobject, jlong paintHandle, jobject metricsObj) {
	Paint::FontMetrics metrics;		SkFontMetrics metrics;

	getMetricsInternal(paintHandle, &metrics);		getMetricsInternal(paintHandle, &metrics);
	int ascent = SkScalarRoundToInt(metrics.fAscent);		int ascent = SkScalarRoundToInt(metrics.fAscent);
	@@ -970,19 +970,19 @@ namespace PaintGlue {
	}		}

	static jfloat ascent(jlong paintHandle) {		static jfloat ascent(jlong paintHandle) {
	Paint::FontMetrics metrics;		SkFontMetrics metrics;
	getMetricsInternal(paintHandle, &metrics);		getMetricsInternal(paintHandle, &metrics);
	return SkScalarToFloat(metrics.fAscent);		return SkScalarToFloat(metrics.fAscent);
	}		}

	static jfloat descent(jlong paintHandle) {		static jfloat descent(jlong paintHandle) {
	Paint::FontMetrics metrics;		SkFontMetrics metrics;
	getMetricsInternal(paintHandle, &metrics);		getMetricsInternal(paintHandle, &metrics);
	return SkScalarToFloat(metrics.fDescent);		return SkScalarToFloat(metrics.fDescent);
	}		}

	static jfloat getUnderlinePosition(jlong paintHandle) {		static jfloat getUnderlinePosition(jlong paintHandle) {
	Paint::FontMetrics metrics;		SkFontMetrics metrics;
	getMetricsInternal(paintHandle, &metrics);		getMetricsInternal(paintHandle, &metrics);
	SkScalar position;		SkScalar position;
	if (metrics.hasUnderlinePosition(&position)) {		if (metrics.hasUnderlinePosition(&position)) {
	@@ -994,7 +994,7 @@ namespace PaintGlue {
	}		}

	static jfloat getUnderlineThickness(jlong paintHandle) {		static jfloat getUnderlineThickness(jlong paintHandle) {
	Paint::FontMetrics metrics;		SkFontMetrics metrics;
	getMetricsInternal(paintHandle, &metrics);		getMetricsInternal(paintHandle, &metrics);
	SkScalar thickness;		SkScalar thickness;
	if (metrics.hasUnderlineThickness(&thickness)) {		if (metrics.hasUnderlineThickness(&thickness)) {

libs/hwui/hwui/Canvas.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -52,7 +52,7 @@ void Canvas::drawTextDecorations(float x, float y, float length, const SkPaint&
	const SkScalar left = x;		const SkScalar left = x;
	const SkScalar right = x + length;		const SkScalar right = x + length;
	if (flags & SkPaint::kUnderlineText_ReserveFlag) {		if (flags & SkPaint::kUnderlineText_ReserveFlag) {
	Paint::FontMetrics metrics;		SkFontMetrics metrics;
	paint.getFontMetrics(&metrics);		paint.getFontMetrics(&metrics);
	SkScalar position;		SkScalar position;
	if (!metrics.hasUnderlinePosition(&position)) {		if (!metrics.hasUnderlinePosition(&position)) {