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

Commit 49ca0244 authored by Seigo Nonaka's avatar Seigo Nonaka
Browse files

Introduce MeasuredText related perf tests 

This CL adds two perf test for MeasuredText: the memory usage and
construction time of MeasuredText.

Here is an example output on walleye-userdebug:

Memory Usage (in bytes)
Hyphenation            :    28,448
Hyphenation WidthOnly  :     8,856
NoHyphenation          :    27,592
NoHyphenation WidthOnly:     8,000

MeasuredText creation time
NoStyled Hyphenation            : 18,977,877
NoStyled Hyphenation WidthOnly  : 18,510,041
NoStyled NoHyphenation          :  7,771,936
NoStyled NoHyphenation WidthOnly:  7,332,537
Styled Hyphenation              : 13,514,428
Styled Hyphenation WidthOnly    : 12,446,143
Styled NoHyphenation            : 13,370,358
Styled NoHyphenation WidthOnly  : 13,582,435

Bug: 72461923
Bug: 72462192
Test: See above

Change-Id: I7d326a9e70a29c38c940e0085da2bc4edf2a098a
parent 783f961d

apct-tests/perftests/core/src/android/text/MeasuredTextMemoryUsageTest.java

0 → 100644
+132 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License"); you may not

 * use this file except in compliance with the License. You may obtain a copy of

 * the License at

 *

 * http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT

 * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

 * License for the specific language governing permissions and limitations under

 * the License.

 */



package android.text;



import static android.text.TextDirectionHeuristics.LTR;



import android.perftests.utils.BenchmarkState;

import android.perftests.utils.PerfStatusReporter;



import android.support.test.filters.LargeTest;

import android.support.test.runner.AndroidJUnit4;



import android.app.Activity;

import android.os.Bundle;

import android.support.test.InstrumentationRegistry;

import android.content.res.ColorStateList;

import android.graphics.Canvas;

import android.graphics.Typeface;

import android.text.Layout;

import android.text.style.TextAppearanceSpan;

import android.view.DisplayListCanvas;

import android.view.RenderNode;



import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;



import java.nio.CharBuffer;

import java.util.Random;



@LargeTest

@RunWith(AndroidJUnit4.class)

public class MeasuredTextMemoryUsageTest {

    private static final int WORD_LENGTH = 9;  // Random word has 9 characters.

    private static final boolean NO_STYLE_TEXT = false;



    private static TextPaint PAINT = new TextPaint();



    private static int TRIAL_COUNT = 100;



    public MeasuredTextMemoryUsageTest() {}



    private TextPerfUtils mTextUtil = new TextPerfUtils();



    @Before

    public void setUp() {

        mTextUtil.resetRandom(0 /* seed */);

    }



    private void reportMemoryUsage(int memoryUsage, String key) {

        Bundle status = new Bundle();

        status.putInt(key + "_median", memoryUsage);

        InstrumentationRegistry.getInstrumentation().sendStatus(Activity.RESULT_OK, status);

    }



    private int median(int[] values) {

        return values.length % 2 == 0 ?

                (values[values.length / 2] + values[values.length / 2 - 1]) / 2:

                values[values.length / 2];

    }



    @Test

    public void testMemoryUsage_NoHyphenation() {

        int[] memories = new int[TRIAL_COUNT];

        // Report median of randomly generated MeasuredText.

        for (int i = 0; i < TRIAL_COUNT; ++i) {

            memories[i] = new MeasuredText.Builder(

                    mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT), PAINT)

                .setBreakStrategy(Layout.BREAK_STRATEGY_SIMPLE)

                .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NONE)

                .build().getMemoryUsage();

        }

        reportMemoryUsage(median(memories), "MemoryUsage_NoHyphenation");

    }



    @Test

    public void testMemoryUsage_Hyphenation() {

        int[] memories = new int[TRIAL_COUNT];

        // Report median of randomly generated MeasuredText.

        for (int i = 0; i < TRIAL_COUNT; ++i) {

            memories[i] = new MeasuredText.Builder(

                    mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT), PAINT)

                .setBreakStrategy(Layout.BREAK_STRATEGY_BALANCED)

                .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NORMAL)

                .build().getMemoryUsage();

        }

        reportMemoryUsage(median(memories), "MemoryUsage_Hyphenation");

    }



    @Test

    public void testMemoryUsage_NoHyphenation_WidthOnly() {

        int[] memories = new int[TRIAL_COUNT];

        // Report median of randomly generated MeasuredText.

        for (int i = 0; i < TRIAL_COUNT; ++i) {

            memories[i] = new MeasuredText.Builder(

                    mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT), PAINT)

                .setBreakStrategy(Layout.BREAK_STRATEGY_SIMPLE)

                .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NONE)

                .build(false /* width only */).getMemoryUsage();

        }

        reportMemoryUsage(median(memories), "MemoryUsage_NoHyphenation_WidthOnly");

    }



    @Test

    public void testMemoryUsage_Hyphenatation_WidthOnly() {

        int[] memories = new int[TRIAL_COUNT];

        // Report median of randomly generated MeasuredText.

        for (int i = 0; i < TRIAL_COUNT; ++i) {

            memories[i] = new MeasuredText.Builder(

                    mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT), PAINT)

                .setBreakStrategy(Layout.BREAK_STRATEGY_BALANCED)

                .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NORMAL)

                .build(false /* width only */).getMemoryUsage();

        }

        reportMemoryUsage(median(memories), "MemoryUsage_Hyphenation_WidthOnly");

    }

}

apct-tests/perftests/core/src/android/text/MeasuredTextPerfTest.java

0 → 100644
+185 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License"); you may not

 * use this file except in compliance with the License. You may obtain a copy of

 * the License at

 *

 * http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT

 * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

 * License for the specific language governing permissions and limitations under

 * the License.

 */



package android.text;



import static android.text.TextDirectionHeuristics.LTR;



import android.perftests.utils.BenchmarkState;

import android.perftests.utils.PerfStatusReporter;



import android.support.test.filters.LargeTest;

import android.support.test.runner.AndroidJUnit4;



import android.content.res.ColorStateList;

import android.graphics.Canvas;

import android.graphics.Typeface;

import android.text.Layout;

import android.text.style.TextAppearanceSpan;

import android.view.DisplayListCanvas;

import android.view.RenderNode;



import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;



import java.nio.CharBuffer;

import java.util.Random;



@LargeTest

@RunWith(AndroidJUnit4.class)

public class MeasuredTextPerfTest {

    private static final int WORD_LENGTH = 9;  // Random word has 9 characters.

    private static final int WORDS_IN_LINE = 8;  // Roughly, 8 words in a line.

    private static final boolean NO_STYLE_TEXT = false;

    private static final boolean STYLE_TEXT = true;



    private static TextPaint PAINT = new TextPaint();

    private static final int TEXT_WIDTH = WORDS_IN_LINE * WORD_LENGTH * (int) PAINT.getTextSize();



    public MeasuredTextPerfTest() {}



    @Rule

    public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter();



    private TextPerfUtils mTextUtil = new TextPerfUtils();



    @Before

    public void setUp() {

        mTextUtil.resetRandom(0 /* seed */);

    }



    @Test

    public void testCreate_NoStyled_Hyphenation() {

        final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        while (state.keepRunning()) {

            state.pauseTiming();

            final CharSequence text = mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT);

            state.resumeTiming();



            new MeasuredText.Builder(text, PAINT)

                    .setBreakStrategy(Layout.BREAK_STRATEGY_BALANCED)

                    .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NORMAL)

                    .build(true /* do full layout */);

        }

    }



    @Test

    public void testCreate_NoStyled_NoHyphenation() {

        final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        while (state.keepRunning()) {

            state.pauseTiming();

            final CharSequence text = mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT);

            state.resumeTiming();



            new MeasuredText.Builder(text, PAINT)

                    .setBreakStrategy(Layout.BREAK_STRATEGY_SIMPLE)

                    .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NONE)

                    .build(true /* do full layout */);

        }

    }



    @Test

    public void testCreate_NoStyled_Hyphenation_WidthOnly() {

        final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        while (state.keepRunning()) {

            state.pauseTiming();

            final CharSequence text = mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT);

            state.resumeTiming();



            new MeasuredText.Builder(text, PAINT)

                    .setBreakStrategy(Layout.BREAK_STRATEGY_BALANCED)

                    .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NORMAL)

                    .build(false /* width only */);

        }

    }



    @Test

    public void testCreate_NoStyled_NoHyphenation_WidthOnly() {

        final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        while (state.keepRunning()) {

            state.pauseTiming();

            final CharSequence text = mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT);

            state.resumeTiming();



            new MeasuredText.Builder(text, PAINT)

                    .setBreakStrategy(Layout.BREAK_STRATEGY_SIMPLE)

                    .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NONE)

                    .build(false /* width only */);

        }

    }



    @Test

    public void testCreate_Styled_Hyphenation() {

        final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        while (state.keepRunning()) {

            state.pauseTiming();

            final CharSequence text = mTextUtil.nextRandomParagraph(WORD_LENGTH, STYLE_TEXT);

            state.resumeTiming();



            new MeasuredText.Builder(text, PAINT)

                    .setBreakStrategy(Layout.BREAK_STRATEGY_BALANCED)

                    .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NORMAL)

                    .build(true /* do full layout */);

        }

    }



    @Test

    public void testCreate_Styled_NoHyphenation() {

        final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        while (state.keepRunning()) {

            state.pauseTiming();

            final CharSequence text = mTextUtil.nextRandomParagraph(WORD_LENGTH, STYLE_TEXT);

            state.resumeTiming();



            new MeasuredText.Builder(text, PAINT)

                    .setBreakStrategy(Layout.BREAK_STRATEGY_SIMPLE)

                    .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NONE)

                    .build(true /* do full layout */);

        }

    }



    @Test

    public void testCreate_Styled_Hyphenation_WidthOnly() {

        final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        while (state.keepRunning()) {

            state.pauseTiming();

            final CharSequence text = mTextUtil.nextRandomParagraph(WORD_LENGTH, STYLE_TEXT);

            state.resumeTiming();



            new MeasuredText.Builder(text, PAINT)

                    .setBreakStrategy(Layout.BREAK_STRATEGY_BALANCED)

                    .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NORMAL)

                    .build(false /* width only */);

        }

    }



    @Test

    public void testCreate_Styled_NoHyphenation_WidthOnly() {

        final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        while (state.keepRunning()) {

            state.pauseTiming();

            final CharSequence text = mTextUtil.nextRandomParagraph(WORD_LENGTH, STYLE_TEXT);

            state.resumeTiming();



            new MeasuredText.Builder(text, PAINT)

                    .setBreakStrategy(Layout.BREAK_STRATEGY_SIMPLE)

                    .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NONE)

                    .build(false /* width only */);

        }

    }

}

apct-tests/perftests/core/src/android/text/StaticLayoutPerfTest.java

+25 −69
Original line number Diff line number Diff line
@@ -43,74 +43,30 @@ import java.util.Random; 
@LargeTest

@RunWith(AndroidJUnit4.class)

public class StaticLayoutPerfTest {



    public StaticLayoutPerfTest() {}



    @Rule

    public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter();



    private static final int WORD_LENGTH = 9;  // Random word has 9 characters.

    private static final int WORDS_IN_LINE = 8;  // Roughly, 8 words in a line.

    private static final int PARA_LENGTH = 500;  // Number of characters in a paragraph.



    private static final boolean NO_STYLE_TEXT = false;

    private static final boolean STYLE_TEXT = true;



    private Random mRandom;



    private static final String ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";

    private static final int ALPHABET_LENGTH = ALPHABET.length();



    private static final ColorStateList TEXT_COLOR = ColorStateList.valueOf(0x00000000);

    private static final String[] FAMILIES = { "sans-serif", "serif", "monospace" };

    private static final int[] STYLES = {

            Typeface.NORMAL, Typeface.BOLD, Typeface.ITALIC, Typeface.BOLD_ITALIC

    };



    private final char[] mBuffer = new char[PARA_LENGTH];



    private static TextPaint PAINT = new TextPaint();

    private static final int TEXT_WIDTH = WORDS_IN_LINE * WORD_LENGTH * (int) PAINT.getTextSize();



    private CharSequence generateRandomParagraph(int wordLen, boolean applyRandomStyle) {

        for (int i = 0; i < PARA_LENGTH; i++) {

            if (i % (wordLen + 1) == wordLen) {

                mBuffer[i] = ' ';

            } else {

                mBuffer[i] = ALPHABET.charAt(mRandom.nextInt(ALPHABET_LENGTH));

            }

        }



        CharSequence cs = CharBuffer.wrap(mBuffer);

        if (!applyRandomStyle) {

            return cs;

        }



        SpannableStringBuilder ssb = new SpannableStringBuilder(cs);

        for (int i = 0; i < ssb.length(); i += WORD_LENGTH) {

            final int spanStart = i;

            final int spanEnd = (i + WORD_LENGTH) > ssb.length() ? ssb.length() : i + WORD_LENGTH;

    public StaticLayoutPerfTest() {}



            final TextAppearanceSpan span = new TextAppearanceSpan(

                  FAMILIES[mRandom.nextInt(FAMILIES.length)],

                  STYLES[mRandom.nextInt(STYLES.length)],

                  24 + mRandom.nextInt(32),  // text size. min 24 max 56

                  TEXT_COLOR, TEXT_COLOR);

    @Rule

    public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter();



            ssb.setSpan(span, spanStart, spanEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);

        }

        return ssb;

    }

    private TextPerfUtils mTextUtil = new TextPerfUtils();



    @Before

    public void setUp() {

        mRandom = new Random(0);

        mTextUtil.resetRandom(0 /* seed */);

    }



    @Test

    public void testCreate_FixedText_NoStyle_Greedy_NoHyphenation() {

        final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        final CharSequence text = generateRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT);

        final CharSequence text = mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT);

        while (state.keepRunning()) {

            StaticLayout.Builder.obtain(text, 0, text.length(), PAINT, TEXT_WIDTH)

                    .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NONE)
@@ -124,7 +80,7 @@ public class StaticLayoutPerfTest { 
        final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        while (state.keepRunning()) {

            state.pauseTiming();

            final CharSequence text = generateRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT);

            final CharSequence text = mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT);

            state.resumeTiming();



            StaticLayout.Builder.obtain(text, 0, text.length(), PAINT, TEXT_WIDTH)
@@ -139,7 +95,7 @@ public class StaticLayoutPerfTest { 
        final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        while (state.keepRunning()) {

            state.pauseTiming();

            final CharSequence text = generateRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT);

            final CharSequence text = mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT);

            state.resumeTiming();



            StaticLayout.Builder.obtain(text, 0, text.length(), PAINT, TEXT_WIDTH)
@@ -154,7 +110,7 @@ public class StaticLayoutPerfTest { 
        final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        while (state.keepRunning()) {

            state.pauseTiming();

            final CharSequence text = generateRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT);

            final CharSequence text = mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT);

            state.resumeTiming();



            StaticLayout.Builder.obtain(text, 0, text.length(), PAINT, TEXT_WIDTH)
@@ -169,7 +125,7 @@ public class StaticLayoutPerfTest { 
        final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        while (state.keepRunning()) {

            state.pauseTiming();

            final CharSequence text = generateRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT);

            final CharSequence text = mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT);

            state.resumeTiming();



            StaticLayout.Builder.obtain(text, 0, text.length(), PAINT, TEXT_WIDTH)
@@ -184,7 +140,7 @@ public class StaticLayoutPerfTest { 
        final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        while (state.keepRunning()) {

            state.pauseTiming();

            final CharSequence text = generateRandomParagraph(WORD_LENGTH, STYLE_TEXT);

            final CharSequence text = mTextUtil.nextRandomParagraph(WORD_LENGTH, STYLE_TEXT);

            state.resumeTiming();



            StaticLayout.Builder.obtain(text, 0, text.length(), PAINT, TEXT_WIDTH)
@@ -200,7 +156,7 @@ public class StaticLayoutPerfTest { 
        while (state.keepRunning()) {

            state.pauseTiming();

            final MeasuredText text = new MeasuredText.Builder(

                    generateRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT), PAINT)

                    mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT), PAINT)

                    .setBreakStrategy(Layout.BREAK_STRATEGY_SIMPLE)

                    .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NONE)

                    .build();
@@ -219,7 +175,7 @@ public class StaticLayoutPerfTest { 
        while (state.keepRunning()) {

            state.pauseTiming();

            final MeasuredText text = new MeasuredText.Builder(

                    generateRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT), PAINT)

                    mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT), PAINT)

                    .setBreakStrategy(Layout.BREAK_STRATEGY_SIMPLE)

                    .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NORMAL)

                    .build();
@@ -238,7 +194,7 @@ public class StaticLayoutPerfTest { 
        while (state.keepRunning()) {

            state.pauseTiming();

            final MeasuredText text = new MeasuredText.Builder(

                    generateRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT), PAINT)

                    mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT), PAINT)

                    .setBreakStrategy(Layout.BREAK_STRATEGY_BALANCED)

                    .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NONE)

                    .build();
@@ -257,7 +213,7 @@ public class StaticLayoutPerfTest { 
        while (state.keepRunning()) {

            state.pauseTiming();

            final MeasuredText text = new MeasuredText.Builder(

                    generateRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT), PAINT)

                    mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT), PAINT)

                    .setBreakStrategy(Layout.BREAK_STRATEGY_BALANCED)

                    .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NORMAL)

                    .build();
@@ -276,7 +232,7 @@ public class StaticLayoutPerfTest { 
        while (state.keepRunning()) {

            state.pauseTiming();

            final MeasuredText text = new MeasuredText.Builder(

                    generateRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT), PAINT)

                    mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT), PAINT)

                    .setBreakStrategy(Layout.BREAK_STRATEGY_SIMPLE)

                    .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NONE)

                    .build();
@@ -292,7 +248,7 @@ public class StaticLayoutPerfTest { 
    @Test

    public void testDraw_FixedText_NoStyled() {

        final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        final CharSequence text = generateRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT);

        final CharSequence text = mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT);

        final RenderNode node = RenderNode.create("benchmark", null);

        while (state.keepRunning()) {

            state.pauseTiming();
@@ -311,7 +267,7 @@ public class StaticLayoutPerfTest { 
        final RenderNode node = RenderNode.create("benchmark", null);

        while (state.keepRunning()) {

            state.pauseTiming();

            final CharSequence text = generateRandomParagraph(WORD_LENGTH, STYLE_TEXT);

            final CharSequence text = mTextUtil.nextRandomParagraph(WORD_LENGTH, STYLE_TEXT);

            final StaticLayout layout =

                    StaticLayout.Builder.obtain(text, 0, text.length(), PAINT, TEXT_WIDTH).build();

            final DisplayListCanvas c = node.start(1200, 200);
@@ -327,7 +283,7 @@ public class StaticLayoutPerfTest { 
        final RenderNode node = RenderNode.create("benchmark", null);

        while (state.keepRunning()) {

            state.pauseTiming();

            final CharSequence text = generateRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT);

            final CharSequence text = mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT);

            final StaticLayout layout =

                    StaticLayout.Builder.obtain(text, 0, text.length(), PAINT, TEXT_WIDTH).build();

            final DisplayListCanvas c = node.start(1200, 200);
@@ -343,7 +299,7 @@ public class StaticLayoutPerfTest { 
        final RenderNode node = RenderNode.create("benchmark", null);

        while (state.keepRunning()) {

            state.pauseTiming();

            final CharSequence text = generateRandomParagraph(WORD_LENGTH, STYLE_TEXT);

            final CharSequence text = mTextUtil.nextRandomParagraph(WORD_LENGTH, STYLE_TEXT);

            final StaticLayout layout =

                    StaticLayout.Builder.obtain(text, 0, text.length(), PAINT, TEXT_WIDTH).build();

            final DisplayListCanvas c = node.start(1200, 200);
@@ -360,7 +316,7 @@ public class StaticLayoutPerfTest { 
        final RenderNode node = RenderNode.create("benchmark", null);

        while (state.keepRunning()) {

            state.pauseTiming();

            final CharSequence text = generateRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT);

            final CharSequence text = mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT);

            final StaticLayout layout =

                    StaticLayout.Builder.obtain(text, 0, text.length(), PAINT, TEXT_WIDTH).build();

            final DisplayListCanvas c = node.start(1200, 200);
@@ -378,7 +334,7 @@ public class StaticLayoutPerfTest { 
        while (state.keepRunning()) {

            state.pauseTiming();

            final MeasuredText text = new MeasuredText.Builder(

                    generateRandomParagraph(WORD_LENGTH, STYLE_TEXT), PAINT).build();

                    mTextUtil.nextRandomParagraph(WORD_LENGTH, STYLE_TEXT), PAINT).build();

            final StaticLayout layout =

                    StaticLayout.Builder.obtain(text, 0, text.length(), PAINT, TEXT_WIDTH).build();

            final DisplayListCanvas c = node.start(1200, 200);
@@ -395,7 +351,7 @@ public class StaticLayoutPerfTest { 
        while (state.keepRunning()) {

            state.pauseTiming();

            final MeasuredText text = new MeasuredText.Builder(

                    generateRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT), PAINT).build();

                    mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT), PAINT).build();

            final StaticLayout layout =

                    StaticLayout.Builder.obtain(text, 0, text.length(), PAINT, TEXT_WIDTH).build();

            final DisplayListCanvas c = node.start(1200, 200);
@@ -412,7 +368,7 @@ public class StaticLayoutPerfTest { 
        while (state.keepRunning()) {

            state.pauseTiming();

            final MeasuredText text = new MeasuredText.Builder(

                    generateRandomParagraph(WORD_LENGTH, STYLE_TEXT), PAINT).build();

                    mTextUtil.nextRandomParagraph(WORD_LENGTH, STYLE_TEXT), PAINT).build();

            final StaticLayout layout =

                    StaticLayout.Builder.obtain(text, 0, text.length(), PAINT, TEXT_WIDTH).build();

            final DisplayListCanvas c = node.start(1200, 200);
@@ -430,7 +386,7 @@ public class StaticLayoutPerfTest { 
        while (state.keepRunning()) {

            state.pauseTiming();

            final MeasuredText text = new MeasuredText.Builder(

                    generateRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT), PAINT).build();

                    mTextUtil.nextRandomParagraph(WORD_LENGTH, NO_STYLE_TEXT), PAINT).build();

            final StaticLayout layout =

                    StaticLayout.Builder.obtain(text, 0, text.length(), PAINT, TEXT_WIDTH).build();

            final DisplayListCanvas c = node.start(1200, 200);

apct-tests/perftests/core/src/android/text/TextPerfUtils.java

0 → 100644
+93 −0

File added.

Preview size limit exceeded, changes collapsed.

core/java/android/text/MeasuredParagraph.java

+10 −0

File changed.

Preview size limit exceeded, changes collapsed.