Skip to content

GitLab

T
tangled
Commit d9b457ed authored by Nektarios Paisios's avatar Nektarios Paisios Committed by Commit Bot
Browse files
Options

Re-wrote boundary searching methods in AXPosition to work with offset boundaries 

This is the first patch resulting from splitting
into multiple patches.

The CreateBoundaryStartPosition and CreateBoundaryEndPosition methods
were re-written to work with boundaries that are not only at the beginning
or the end of specific nodes, but could also fall on a text offset
*within* a node.

This patch doesn't create any new publicly exposed functionality in AXPosition.

Even though all existing tests should be passing unmodified,
this patch has uncovered a bug on how we used to compute upstream affinity which has now been fixed.

A followup patch will re-write word navigation functionality to use the above two methods.
A second followup patch will introduce support for document markers in AXPosition.

R=kschmi@microsoft.com, aleventhal@chromium.org, ethavar@microsoft.com

https: //crrev.com/c/1874254/
Bug: 1008031
Change-Id: I1ed67028c950cda1226c3a1b9b732a8d5a2af036
Change-Id: I1ed67028c950cda1226c3a1b9b732a8d5a2af036
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1894159
Commit-Queue: Nektarios Paisios <nektar@chromium.org>
Reviewed-by: default avatarAaron Leventhal <aleventhal@chromium.org>
Reviewed-by: default avatarKurt Catti-Schmidt <kschmi@microsoft.com>
Cr-Commit-Position: refs/heads/master@{#713509}
parent d3ac391b
Expand all Show whitespace changes
Inline Side-by-side
Showing with 204 additions and 78 deletions
ui/accessibility/ax_node_position_unittest.cc
View file @ d9b457ed
......@@ -6314,9 +6314,9 @@ INSTANTIATE_TEST_SUITE_P(
"TextPosition anchor_id=1 text_offset=0 "
"affinity=downstream annotated_text=<L>ine 1\nLine 2",
"TextPosition anchor_id=1 text_offset=0 "
"affinity=upstream annotated_text=<L>ine 1\nLine 2",
"affinity=downstream annotated_text=<L>ine 1\nLine 2",
"TextPosition anchor_id=1 text_offset=0 "
"affinity=upstream annotated_text=<L>ine 1\nLine 2"}},
"affinity=downstream annotated_text=<L>ine 1\nLine 2"}},
TextNavigationTestParam{
base::BindRepeating([](const TestPositionType& position) {
return position->CreatePreviousLineStartPosition(
......@@ -6634,10 +6634,6 @@ INSTANTIATE_TEST_SUITE_P(
CreatePreviousLineEndPositionWithBoundaryBehaviorStopAtAnchorBoundary,
AXPositionTextNavigationTestWithParam,
testing::Values(
// Note that for the first two tests we can't go past the line ending at
// "Line 1" to test for "NullPosition'", because the text position at
// the beginning of the soft line break is equivalent to the position at
// the end of the line's text and so an infinite recursion will occur.
TextNavigationTestParam{
base::BindRepeating([](const TestPositionType& position) {
return position->CreatePreviousLineEndPosition(
......@@ -6776,9 +6772,9 @@ INSTANTIATE_TEST_SUITE_P(
{"TextPosition anchor_id=1 text_offset=6 "
"affinity=downstream annotated_text=Line 1<\n>Line 2",
"TextPosition anchor_id=1 text_offset=0 "
"affinity=upstream annotated_text=<L>ine 1\nLine 2",
"affinity=downstream annotated_text=<L>ine 1\nLine 2",
"TextPosition anchor_id=1 text_offset=0 "
"affinity=upstream annotated_text=<L>ine 1\nLine 2"}},
"affinity=downstream annotated_text=<L>ine 1\nLine 2"}},
TextNavigationTestParam{
base::BindRepeating([](const TestPositionType& position) {
return position->CreatePreviousLineEndPosition(
......@@ -6800,9 +6796,9 @@ INSTANTIATE_TEST_SUITE_P(
ROOT_ID,
5 /* text_offset on the last character of "Line 1". */,
{"TextPosition anchor_id=1 text_offset=0 "
"affinity=upstream annotated_text=<L>ine 1\nLine 2",
"affinity=downstream annotated_text=<L>ine 1\nLine 2",
"TextPosition anchor_id=1 text_offset=0 "
"affinity=upstream annotated_text=<L>ine 1\nLine 2"}},
"affinity=downstream annotated_text=<L>ine 1\nLine 2"}},
TextNavigationTestParam{
base::BindRepeating([](const TestPositionType& position) {
return position->CreatePreviousLineEndPosition(
......@@ -7196,9 +7192,9 @@ INSTANTIATE_TEST_SUITE_P(
"TextPosition anchor_id=1 text_offset=0 "
"affinity=downstream annotated_text=<L>ine 1\nLine 2",
"TextPosition anchor_id=1 text_offset=0 "
"affinity=upstream annotated_text=<L>ine 1\nLine 2",
"affinity=downstream annotated_text=<L>ine 1\nLine 2",
"TextPosition anchor_id=1 text_offset=0 "
"affinity=upstream annotated_text=<L>ine 1\nLine 2"}},
"affinity=downstream annotated_text=<L>ine 1\nLine 2"}},
TextNavigationTestParam{
base::BindRepeating([](const TestPositionType& position) {
return position->CreatePreviousParagraphStartPosition(
......@@ -7310,6 +7306,8 @@ INSTANTIATE_TEST_SUITE_P(
"TextPosition anchor_id=1 text_offset=13 "
"affinity=downstream annotated_text=Line 1\nLine 2<>",
"TextPosition anchor_id=1 text_offset=13 "
"affinity=downstream annotated_text=Line 1\nLine 2<>",
"TextPosition anchor_id=1 text_offset=13 "
"affinity=downstream annotated_text=Line 1\nLine 2<>"}},
TextNavigationTestParam{
base::BindRepeating([](const TestPositionType& position) {
......@@ -7323,6 +7321,8 @@ INSTANTIATE_TEST_SUITE_P(
"TextPosition anchor_id=4 text_offset=13 "
"affinity=downstream annotated_text=Line 1\nLine 2<>",
"TextPosition anchor_id=4 text_offset=13 "
"affinity=downstream annotated_text=Line 1\nLine 2<>",
"TextPosition anchor_id=4 text_offset=13 "
"affinity=downstream annotated_text=Line 1\nLine 2<>"}},
TextNavigationTestParam{
base::BindRepeating([](const TestPositionType& position) {
......@@ -7359,9 +7359,9 @@ INSTANTIATE_TEST_SUITE_P(
ROOT_ID,
0 /* text_offset */,
{"TextPosition anchor_id=1 text_offset=0 "
"affinity=upstream annotated_text=<L>ine 1\nLine 2",
"affinity=downstream annotated_text=<L>ine 1\nLine 2",
"TextPosition anchor_id=1 text_offset=0 "
"affinity=upstream annotated_text=<L>ine 1\nLine 2"}},
"affinity=downstream annotated_text=<L>ine 1\nLine 2"}},
TextNavigationTestParam{
base::BindRepeating([](const TestPositionType& position) {
return position->CreateNextParagraphEndPosition(
......@@ -7487,7 +7487,7 @@ INSTANTIATE_TEST_SUITE_P(
{"TextPosition anchor_id=1 text_offset=7 "
"affinity=upstream annotated_text=Line 1\n<L>ine 2",
"TextPosition anchor_id=1 text_offset=0 "
"affinity=upstream annotated_text=<L>ine 1\nLine 2",
"affinity=downstream annotated_text=<L>ine 1\nLine 2",
"NullPosition"}},
TextNavigationTestParam{
base::BindRepeating([](const TestPositionType& position) {
......@@ -7509,7 +7509,7 @@ INSTANTIATE_TEST_SUITE_P(
ROOT_ID,
5 /* text_offset on the last character of "Line 1". */,
{"TextPosition anchor_id=1 text_offset=0 "
"affinity=upstream annotated_text=<L>ine 1\nLine 2",
"affinity=downstream annotated_text=<L>ine 1\nLine 2",
"NullPosition"}},
TextNavigationTestParam{
base::BindRepeating([](const TestPositionType& position) {
......@@ -7548,10 +7548,6 @@ INSTANTIATE_TEST_SUITE_P(
CreatePreviousParagraphEndPositionWithBoundaryBehaviorStopAtAnchorBoundary,
AXPositionTextNavigationTestWithParam,
testing::Values(
// Note that for the first two tests we can't go past the line ending at
// "Line 1" to test for "NullPosition'", because the text position at
// the beginning of the soft line break is equivalent to the position at
// the end of the line's text and so an infinite recursion will occur.
TextNavigationTestParam{
base::BindRepeating([](const TestPositionType& position) {
return position->CreatePreviousParagraphEndPosition(
......@@ -7562,7 +7558,9 @@ INSTANTIATE_TEST_SUITE_P(
{"TextPosition anchor_id=1 text_offset=7 "
"affinity=upstream annotated_text=Line 1\n<L>ine 2",
"TextPosition anchor_id=1 text_offset=0 "
"affinity=upstream annotated_text=<L>ine 1\nLine 2"}},
"affinity=downstream annotated_text=<L>ine 1\nLine 2",
"TextPosition anchor_id=1 text_offset=0 "
"affinity=downstream annotated_text=<L>ine 1\nLine 2"}},
TextNavigationTestParam{
base::BindRepeating([](const TestPositionType& position) {
return position->CreatePreviousParagraphEndPosition(
......@@ -7573,6 +7571,8 @@ INSTANTIATE_TEST_SUITE_P(
{"TextPosition anchor_id=4 text_offset=7 "
"affinity=upstream annotated_text=Line 1\n<L>ine 2",
"TextPosition anchor_id=4 text_offset=0 "
"affinity=downstream annotated_text=<L>ine 1\nLine 2",
"TextPosition anchor_id=4 text_offset=0 "
"affinity=downstream annotated_text=<L>ine 1\nLine 2"}},
TextNavigationTestParam{
base::BindRepeating([](const TestPositionType& position) {
......@@ -7582,7 +7582,7 @@ INSTANTIATE_TEST_SUITE_P(
ROOT_ID,
5 /* text_offset on the last character of "Line 1". */,
{"TextPosition anchor_id=1 text_offset=0 "
"affinity=upstream annotated_text=<L>ine 1\nLine 2",
"affinity=downstream annotated_text=<L>ine 1\nLine 2",
"TextPosition anchor_id=1 text_offset=0 "
"affinity=downstream annotated_text=<L>ine 1\nLine 2"}},
TextNavigationTestParam{
......@@ -7715,9 +7715,9 @@ INSTANTIATE_TEST_SUITE_P(
{"TextPosition anchor_id=1 text_offset=7 "
"affinity=upstream annotated_text=Line 1\n<L>ine 2",
"TextPosition anchor_id=1 text_offset=0 "
"affinity=upstream annotated_text=<L>ine 1\nLine 2",
"affinity=downstream annotated_text=<L>ine 1\nLine 2",
"TextPosition anchor_id=1 text_offset=0 "
"affinity=upstream annotated_text=<L>ine 1\nLine 2"}},
"affinity=downstream annotated_text=<L>ine 1\nLine 2"}},
TextNavigationTestParam{
base::BindRepeating([](const TestPositionType& position) {
return position->CreatePreviousParagraphEndPosition(
......@@ -7740,9 +7740,9 @@ INSTANTIATE_TEST_SUITE_P(
ROOT_ID,
5 /* text_offset on the last character of "Line 1". */,
{"TextPosition anchor_id=1 text_offset=0 "
"affinity=upstream annotated_text=<L>ine 1\nLine 2",
"affinity=downstream annotated_text=<L>ine 1\nLine 2",
"TextPosition anchor_id=1 text_offset=0 "
"affinity=upstream annotated_text=<L>ine 1\nLine 2"}},
"affinity=downstream annotated_text=<L>ine 1\nLine 2"}},
TextNavigationTestParam{
base::BindRepeating([](const TestPositionType& position) {
return position->CreatePreviousParagraphEndPosition(
......
ui/accessibility/ax_position.h
View file @ d9b457ed
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment