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

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

Merge "don't compute outside of visible range"

parents f67c710a a930e6e7

core/java/android/text/TextLine.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -276,6 +276,7 @@ public class TextLine { 
        final int runCount = mDirections.getRunCount();

        final int runCount = mDirections.getRunCount();

        for (int runIndex = 0; runIndex < runCount; runIndex++) {

        for (int runIndex = 0; runIndex < runCount; runIndex++) {

            final int runStart = mDirections.getRunStart(runIndex);

            final int runStart = mDirections.getRunStart(runIndex);

            if (runStart >= mLen) break;

            final int runLimit = Math.min(runStart + mDirections.getRunLength(runIndex), mLen);

            final int runLimit = Math.min(runStart + mDirections.getRunLength(runIndex), mLen);

            final boolean runIsRtl = mDirections.isRunRtl(runIndex);

            final boolean runIsRtl = mDirections.isRunRtl(runIndex);
@@ -360,6 +361,7 @@ public class TextLine { 
        float h = 0;

        float h = 0;

        for (int runIndex = 0; runIndex < mDirections.getRunCount(); runIndex++) {

        for (int runIndex = 0; runIndex < mDirections.getRunCount(); runIndex++) {

            final int runStart = mDirections.getRunStart(runIndex);

            final int runStart = mDirections.getRunStart(runIndex);

            if (runStart >= mLen) break;

            final int runLimit = Math.min(runStart + mDirections.getRunLength(runIndex), mLen);

            final int runLimit = Math.min(runStart + mDirections.getRunLength(runIndex), mLen);

            final boolean runIsRtl = mDirections.isRunRtl(runIndex);

            final boolean runIsRtl = mDirections.isRunRtl(runIndex);
@@ -417,6 +419,7 @@ public class TextLine { 
        float h = 0;

        float h = 0;

        for (int runIndex = 0; runIndex < mDirections.getRunCount(); runIndex++) {

        for (int runIndex = 0; runIndex < mDirections.getRunCount(); runIndex++) {

            final int runStart = mDirections.getRunStart(runIndex);

            final int runStart = mDirections.getRunStart(runIndex);

            if (runStart > mLen) break;

            final int runLimit = Math.min(runStart + mDirections.getRunLength(runIndex), mLen);

            final int runLimit = Math.min(runStart + mDirections.getRunLength(runIndex), mLen);

            final boolean runIsRtl = mDirections.isRunRtl(runIndex);

            final boolean runIsRtl = mDirections.isRunRtl(runIndex);