Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5d6838e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Early exit if there are no spans affecting display"

parents 842a51d8 08836d4c

core/java/android/text/TextLine.java

+10 −3
Original line number Diff line number Diff line
@@ -986,7 +986,17 @@ class TextLine { 
            return 0f;

        }



        final boolean needsSpanMeasurement;

        if (mSpanned == null) {

            needsSpanMeasurement = false;

        } else {

            mMetricAffectingSpanSpanSet.init(mSpanned, mStart + start, mStart + limit);

            mCharacterStyleSpanSet.init(mSpanned, mStart + start, mStart + limit);

            needsSpanMeasurement = mMetricAffectingSpanSpanSet.numberOfSpans != 0

                    || mCharacterStyleSpanSet.numberOfSpans != 0;

        }



        if (!needsSpanMeasurement) {

            final TextPaint wp = mWorkPaint;

            wp.set(mPaint);

            wp.setHyphenEdit(adjustHyphenEdit(start, limit, wp.getHyphenEdit()));
@@ -994,9 +1004,6 @@ class TextLine { 
                    y, bottom, fmi, needWidth, measureLimit, null);

        }



        mMetricAffectingSpanSpanSet.init(mSpanned, mStart + start, mStart + limit);

        mCharacterStyleSpanSet.init(mSpanned, mStart + start, mStart + limit);



        // Shaping needs to take into account context up to metric boundaries,

        // but rendering needs to take into account character style boundaries.

        // So we iterate through metric runs to get metric bounds,