Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Optimize TextView#populateCharacterBounds

Browse Source 
Avoid unnecessary calls of getPrimaryHorizontal/getSecondaryHorizontal,
this will make the method around 2 times faster.
Also avoid repeat calls of isPositionVisible, which reduces the
computation time around 5%.

Before:
	populateCharacterBounds[mTextLength (100))]_min (ns): 416685
	populateCharacterBounds[mTextLength (300))]_min (ns): 1315209
	populateCharacterBounds[mTextLength (1,000))]_min (ns): 4480508
	populateCharacterBounds[mTextLength (3,000))]_min (ns): 13526504
	populateCharacterBounds[mTextLength (10,000))]_min (ns): 44841361

After:
        populateCharacterBounds[mTextLength (100))]_min (ns): 204065
        populateCharacterBounds[mTextLength (300))]_min (ns): 653159
        populateCharacterBounds[mTextLength (1,000))]_min (ns): 2184327
        populateCharacterBounds[mTextLength (3,000))]_min (ns): 6770318
        populateCharacterBounds[mTextLength (10,000))]_min (ns): 22777530

Bug: 233922052
Test: atest android.text.TextViewCursorAnchorInfoPerfTest
Change-Id: I24a470e204e4a2e52f881828c707adfcca21f890
This commit is contained in:
Haoyu Zhang
2022-05-25 13:15:08 -07:00
parent 000f3f18b0
commit bc317e642c
2 changed files with 143 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

133
apct-tests/perftests/core/src/android/text/TextViewCursorAnchorInfoPerfTest.java Normal file
View File

@@ -0,0 +1,133 @@
/*
* Copyright (C) 2022 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 android.app.Activity;
import android.content.Context;
import android.perftests.utils.BenchmarkState;
import android.perftests.utils.PerfStatusReporter;
import android.perftests.utils.PerfTestActivity;
import android.platform.test.annotations.LargeTest;
import android.util.AttributeSet;
import android.view.View;
import android.view.ViewGroup;
import android.view.inputmethod.CursorAnchorInfo;
import android.widget.TextView;
import androidx.test.rule.ActivityTestRule;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import java.util.Arrays;
import java.util.Collection;
@LargeTest
@RunWith(Parameterized.class)
public class TextViewCursorAnchorInfoPerfTest {
@Parameterized.Parameters(name = "mTextLength ({0}))")
public static Collection<Integer> data() {
return Arrays.asList(100, 300, 1000, 3000, 10000);
}
private static final int WORD_LENGTH = 9; // Random word has 9 characters.
private static final int WORDS_IN_LINE = 12; // Roughly, 12 words in a line.
private static final TextPaint PAINT = new TextPaint();
// The width is an estimation. There might be lines with less or more words.
private static final int TEXT_WIDTH = WORDS_IN_LINE * WORD_LENGTH * (int) PAINT.getTextSize();
private static final int TEXT_HEIGHT = 1024;
@Parameterized.Parameter(0)
public int mTextLength;
@Rule
public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter();
@Rule
public ActivityTestRule<PerfTestActivity> mActivityTestRule = new ActivityTestRule<>(
PerfTestActivity.class);
private TextPerfUtils mTextUtil = new TextPerfUtils();
private PerfTextView mTextView;
@Before
public void setUp() {
mTextUtil.resetRandom(0 /* seed */);
}
public void setUpTextView() {
Activity activity = mActivityTestRule.getActivity();
mTextView = new PerfTextView(activity);
mTextView.setHeight(TEXT_HEIGHT);
mTextView.setWidth(TEXT_WIDTH);
final ViewGroup.LayoutParams p = new ViewGroup.LayoutParams(TEXT_WIDTH, TEXT_HEIGHT);
mTextView.setLayoutParams(p);
activity.setContentView(mTextView);
mTextView.setText(mTextUtil.nextRandomParagraph(WORD_LENGTH, mTextLength));
mTextView.invalidate();
mTextView.mySetFrame(TEXT_WIDTH, TEXT_HEIGHT);
mTextView.measure(View.MeasureSpec.makeMeasureSpec(TEXT_WIDTH, View.MeasureSpec.EXACTLY),
View.MeasureSpec.makeMeasureSpec(TEXT_HEIGHT, View.MeasureSpec.EXACTLY));
mTextView.layout(0, 0, TEXT_WIDTH, TEXT_HEIGHT);
}
@Test
public void testPopulateCharacterBounds() throws Throwable {
final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
mActivityTestRule.runOnUiThread(() -> {
setUpTextView();
while (state.keepRunning()) {
final CursorAnchorInfo.Builder builder = new CursorAnchorInfo.Builder();
mTextView.populateCharacterBounds(builder, 0, mTextLength, 0f, 0f);
}
});
}
private static class PerfTextView extends TextView {
PerfTextView(Context context) {
super(context);
}
PerfTextView(Context context, AttributeSet attrs) {
super(context, attrs);
}
PerfTextView(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
}
PerfTextView(Context context, AttributeSet attrs, int defStyleAttr,
int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
}
void mySetFrame(int width, int height) {
super.setFrame(0, 0, width, height);
}
}
}

23
core/java/android/widget/TextView.java
View File

@@ -12493,6 +12493,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
float viewportToContentVerticalOffset) {
final int minLine = mLayout.getLineForOffset(startIndex);
final int maxLine = mLayout.getLineForOffset(endIndex - 1);
final Rect rect = new Rect();
getLocalVisibleRect(rect);
final RectF visibleRect = new RectF(rect);
for (int line = minLine; line <= maxLine; ++line) {
final int lineStart = mLayout.getLineStart(line);
final int lineEnd = mLayout.getLineEnd(line);
@@ -12507,37 +12510,31 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
for (int offset = offsetStart; offset < offsetEnd; ++offset) {
final float charWidth = widths[offset - offsetStart];
final boolean isRtl = mLayout.isRtlCharAt(offset);
final float primary = mLayout.getPrimaryHorizontal(offset);
final float secondary = mLayout.getSecondaryHorizontal(offset);
// TODO: This doesn't work perfectly for text with custom styles and
// TAB chars.
final float left;
final float right;
if (ltrLine) {
if (isRtl) {
left = secondary - charWidth;
right = secondary;
left = mLayout.getSecondaryHorizontal(offset) - charWidth;
} else {
left = primary;
right = primary + charWidth;
left = mLayout.getPrimaryHorizontal(offset);
}
} else {
if (!isRtl) {
left = secondary;
right = secondary + charWidth;
left = mLayout.getSecondaryHorizontal(offset);
} else {
left = primary - charWidth;
right = primary;
left = mLayout.getPrimaryHorizontal(offset) - charWidth;
}
}
final float right = left + charWidth;
// TODO: Check top-right and bottom-left as well.
final float localLeft = left + viewportToContentHorizontalOffset;
final float localRight = right + viewportToContentHorizontalOffset;
final float localTop = top + viewportToContentVerticalOffset;
final float localBottom = bottom + viewportToContentVerticalOffset;
final boolean isTopLeftVisible = isPositionVisible(localLeft, localTop);
final boolean isTopLeftVisible = visibleRect.contains(localLeft, localTop);
final boolean isBottomRightVisible =
isPositionVisible(localRight, localBottom);
visibleRect.contains(localRight, localBottom);
int characterBoundsFlags = 0;
if (isTopLeftVisible || isBottomRightVisible) {
characterBoundsFlags |= FLAG_HAS_VISIBLE_REGION;