commit 3593549b271fced8dbd6acd190b282fd85937428
author Seigo Nonaka <nona@google.com> Wed Apr 11 13:11:35 2018 -0700
committer Seigo Nonaka <nona@google.com> Wed Apr 11 20:18:34 2018 +0000
tree e39e54499fc1fd5cee3f08641a8dc16e3548bea1
parent f418d345c9d499d66490f13636cb624681e9eace

Update measureText arguments and MinikinExtent member.

Bug: 72461923
Test: N/A
Change-Id: I0a58bf0cfb80ff2f3d753b73de0f607f86fb8a33

libs/hwui/hwui/MinikinSkia.cpp

diff --git a/libs/hwui/hwui/MinikinSkia.cpp b/libs/hwui/hwui/MinikinSkia.cpp
index 5d33860..b03fa3c 100644
--- a/libs/hwui/hwui/MinikinSkia.cpp
+++ b/libs/hwui/hwui/MinikinSkia.cpp
@@ -81,7 +81,6 @@
     skPaint.getFontMetrics(&metrics);
     extent->ascent = metrics.fAscent;
     extent->descent = metrics.fDescent;
-    extent->line_gap = metrics.fLeading;
 }
 
 SkTypeface* MinikinFontSkia::GetSkTypeface() const {

libs/hwui/hwui/MinikinUtils.cpp

diff --git a/libs/hwui/hwui/MinikinUtils.cpp b/libs/hwui/hwui/MinikinUtils.cpp
index 5b69bb7..a785591 100644
--- a/libs/hwui/hwui/MinikinUtils.cpp
+++ b/libs/hwui/hwui/MinikinUtils.cpp
@@ -78,8 +78,7 @@
     const minikin::EndHyphenEdit endHyphen = minikin::endHyphenEdit(hyphenEdit);
 
     return minikin::Layout::measureText(textBuf, range, bidiFlags, minikinPaint, startHyphen,
-                                        endHyphen, advances, nullptr /* extent */,
-                                        nullptr /* layout pieces */);
+                                        endHyphen, advances, nullptr /* layout pieces */);
 }
 
 bool MinikinUtils::hasVariationSelector(const Typeface* typeface, uint32_t codepoint, uint32_t vs) {