diff options
| -rw-r--r-- | core/jni/android/graphics/Paint.cpp | 14 | ||||
| -rw-r--r-- | libs/hwui/hwui/Canvas.cpp | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/core/jni/android/graphics/Paint.cpp b/core/jni/android/graphics/Paint.cpp index df24bc4d2abc..e97c9bc911dd 100644 --- a/core/jni/android/graphics/Paint.cpp +++ b/core/jni/android/graphics/Paint.cpp @@ -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 kElegantBottom = -1000; const int kElegantAscent = 1900; @@ -609,7 +609,7 @@ namespace PaintGlue { } static jfloat getFontMetrics(JNIEnv* env, jobject, jlong paintHandle, jobject metricsObj) { - Paint::FontMetrics metrics; + SkFontMetrics metrics; SkScalar spacing = getMetricsInternal(paintHandle, &metrics); if (metricsObj) { @@ -624,7 +624,7 @@ namespace PaintGlue { } static jint getFontMetricsInt(JNIEnv* env, jobject, jlong paintHandle, jobject metricsObj) { - Paint::FontMetrics metrics; + SkFontMetrics metrics; getMetricsInternal(paintHandle, &metrics); int ascent = SkScalarRoundToInt(metrics.fAscent); @@ -970,19 +970,19 @@ namespace PaintGlue { } static jfloat ascent(jlong paintHandle) { - Paint::FontMetrics metrics; + SkFontMetrics metrics; getMetricsInternal(paintHandle, &metrics); return SkScalarToFloat(metrics.fAscent); } static jfloat descent(jlong paintHandle) { - Paint::FontMetrics metrics; + SkFontMetrics metrics; getMetricsInternal(paintHandle, &metrics); return SkScalarToFloat(metrics.fDescent); } static jfloat getUnderlinePosition(jlong paintHandle) { - Paint::FontMetrics metrics; + SkFontMetrics metrics; getMetricsInternal(paintHandle, &metrics); SkScalar position; if (metrics.hasUnderlinePosition(&position)) { @@ -994,7 +994,7 @@ namespace PaintGlue { } static jfloat getUnderlineThickness(jlong paintHandle) { - Paint::FontMetrics metrics; + SkFontMetrics metrics; getMetricsInternal(paintHandle, &metrics); SkScalar thickness; if (metrics.hasUnderlineThickness(&thickness)) { diff --git a/libs/hwui/hwui/Canvas.cpp b/libs/hwui/hwui/Canvas.cpp index e2ea2bc37375..a09da6bf359e 100644 --- a/libs/hwui/hwui/Canvas.cpp +++ b/libs/hwui/hwui/Canvas.cpp @@ -52,7 +52,7 @@ void Canvas::drawTextDecorations(float x, float y, float length, const SkPaint& const SkScalar left = x; const SkScalar right = x + length; if (flags & SkPaint::kUnderlineText_ReserveFlag) { - Paint::FontMetrics metrics; + SkFontMetrics metrics; paint.getFontMetrics(&metrics); SkScalar position; if (!metrics.hasUnderlinePosition(&position)) { |