commit dcb2574ae17c834e425a0e6a3affb3fdbc225c14
author Siyamed Sinir <siyamed@google.com> Thu Mar 31 01:50:29 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 31 01:50:30 2016 +0000
tree 21bca32cd4644ea98469202a0c141d83995ff6a5
parent b4142f70e5a65338019e9f79b59adc4fc78b32e1
parent 70f660f2d6220b10ddb5e32d665c38e30f0ab35c

Merge "Reset FontMetrics at each new measurement in BoringLayout" into nyc-dev

core/java/android/text/BoringLayout.java

diff --git a/core/java/android/text/BoringLayout.java b/core/java/android/text/BoringLayout.java
index a1bc2d1..328fe99 100644
--- a/core/java/android/text/BoringLayout.java
+++ b/core/java/android/text/BoringLayout.java
@@ -300,6 +300,8 @@
             Metrics fm = metrics;
             if (fm == null) {
                 fm = new Metrics();
+            } else {
+                fm.reset();
             }
 
             TextLine line = TextLine.obtain();
@@ -414,8 +416,6 @@
         mEllipsizedCount = end - start;
     }
 
-    private static final char FIRST_RIGHT_TO_LEFT = '\u0590';
-
     private String mDirect;
     private Paint mPaint;
 
@@ -430,5 +430,14 @@
         @Override public String toString() {
             return super.toString() + " width=" + width;
         }
+
+        private void reset() {
+            top = 0;
+            bottom = 0;
+            ascent = 0;
+            descent = 0;
+            width = 0;
+            leading = 0;
+        }
     }
 }