| Index: content/browser/accessibility/browser_accessibility_manager_unittest.cc
|
| diff --git a/content/browser/accessibility/browser_accessibility_manager_unittest.cc b/content/browser/accessibility/browser_accessibility_manager_unittest.cc
|
| index dfb0cf5d68c5164e54adf0400e4711abe2af2bd4..e4309f0215714ff0714c8704c48f82e9233414e2 100644
|
| --- a/content/browser/accessibility/browser_accessibility_manager_unittest.cc
|
| +++ b/content/browser/accessibility/browser_accessibility_manager_unittest.cc
|
| @@ -694,28 +694,28 @@ TEST(BrowserAccessibilityManagerTest, BoundsForRange) {
|
| ASSERT_NE(nullptr, static_text_accessible);
|
|
|
| EXPECT_EQ(gfx::Rect(100, 100, 6, 9).ToString(),
|
| - static_text_accessible->GetLocalBoundsForRange(0, 1).ToString());
|
| + static_text_accessible->GetPageBoundsForRange(0, 1).ToString());
|
|
|
| EXPECT_EQ(gfx::Rect(100, 100, 26, 9).ToString(),
|
| - static_text_accessible->GetLocalBoundsForRange(0, 5).ToString());
|
| + static_text_accessible->GetPageBoundsForRange(0, 5).ToString());
|
|
|
| EXPECT_EQ(gfx::Rect(100, 109, 5, 9).ToString(),
|
| - static_text_accessible->GetLocalBoundsForRange(7, 1).ToString());
|
| + static_text_accessible->GetPageBoundsForRange(7, 1).ToString());
|
|
|
| EXPECT_EQ(gfx::Rect(100, 109, 25, 9).ToString(),
|
| - static_text_accessible->GetLocalBoundsForRange(7, 5).ToString());
|
| + static_text_accessible->GetPageBoundsForRange(7, 5).ToString());
|
|
|
| EXPECT_EQ(gfx::Rect(100, 100, 29, 18).ToString(),
|
| - static_text_accessible->GetLocalBoundsForRange(5, 3).ToString());
|
| + static_text_accessible->GetPageBoundsForRange(5, 3).ToString());
|
|
|
| EXPECT_EQ(gfx::Rect(100, 100, 29, 18).ToString(),
|
| - static_text_accessible->GetLocalBoundsForRange(0, 13).ToString());
|
| + static_text_accessible->GetPageBoundsForRange(0, 13).ToString());
|
|
|
| // Note that each child in the parent element is represented by a single
|
| // embedded object character and not by its text.
|
| // TODO(nektar): Investigate failure on Linux.
|
| EXPECT_EQ(gfx::Rect(100, 100, 29, 18).ToString(),
|
| - root_accessible->GetLocalBoundsForRange(0, 13).ToString());
|
| + root_accessible->GetPageBoundsForRange(0, 13).ToString());
|
| }
|
|
|
| TEST(BrowserAccessibilityManagerTest, BoundsForRangeMultiElement) {
|
| @@ -777,43 +777,43 @@ TEST(BrowserAccessibilityManagerTest, BoundsForRangeMultiElement) {
|
|
|
| // The first line.
|
| EXPECT_EQ(gfx::Rect(0, 20, 33, 9).ToString(),
|
| - manager->GetLocalBoundsForRange(
|
| + manager->GetPageBoundsForRange(
|
| *static_text_accessible, 0,
|
| *static_text_accessible, 3).ToString());
|
|
|
| // Part of the first line.
|
| EXPECT_EQ(gfx::Rect(0, 20, 21, 9).ToString(),
|
| - manager->GetLocalBoundsForRange(
|
| + manager->GetPageBoundsForRange(
|
| *static_text_accessible, 0,
|
| *static_text_accessible, 2).ToString());
|
|
|
| // Part of the first line.
|
| EXPECT_EQ(gfx::Rect(10, 20, 23, 9).ToString(),
|
| - manager->GetLocalBoundsForRange(
|
| + manager->GetPageBoundsForRange(
|
| *static_text_accessible, 1,
|
| *static_text_accessible, 3).ToString());
|
|
|
| // The second line.
|
| EXPECT_EQ(gfx::Rect(10, 40, 33, 9).ToString(),
|
| - manager->GetLocalBoundsForRange(
|
| + manager->GetPageBoundsForRange(
|
| *static_text_accessible2, 0,
|
| *static_text_accessible2, 3).ToString());
|
|
|
| // All of both lines.
|
| EXPECT_EQ(gfx::Rect(0, 20, 43, 29).ToString(),
|
| - manager->GetLocalBoundsForRange(
|
| + manager->GetPageBoundsForRange(
|
| *static_text_accessible, 0,
|
| *static_text_accessible2, 3).ToString());
|
|
|
| // Part of both lines.
|
| EXPECT_EQ(gfx::Rect(10, 20, 23, 29).ToString(),
|
| - manager->GetLocalBoundsForRange(
|
| + manager->GetPageBoundsForRange(
|
| *static_text_accessible, 2,
|
| *static_text_accessible2, 1).ToString());
|
|
|
| // Part of both lines in reverse order.
|
| EXPECT_EQ(gfx::Rect(10, 20, 23, 29).ToString(),
|
| - manager->GetLocalBoundsForRange(
|
| + manager->GetPageBoundsForRange(
|
| *static_text_accessible2, 1,
|
| *static_text_accessible, 2).ToString());
|
| }
|
| @@ -824,7 +824,7 @@ TEST(BrowserAccessibilityManagerTest, BoundsForRangeBiDi) {
|
| // words, on-screen it would look like "123cba". This is possible to
|
| // achieve if the source string had unicode control characters
|
| // to switch directions. This test doesn't worry about how, though - it just
|
| - // tests that if something like that were to occur, GetLocalBoundsForRange
|
| + // tests that if something like that were to occur, GetPageBoundsForRange
|
| // returns the correct bounds for different ranges.
|
|
|
| ui::AXNodeData root;
|
| @@ -880,24 +880,24 @@ TEST(BrowserAccessibilityManagerTest, BoundsForRangeBiDi) {
|
| ASSERT_NE(nullptr, static_text_accessible);
|
|
|
| EXPECT_EQ(gfx::Rect(100, 100, 60, 20).ToString(),
|
| - static_text_accessible->GetLocalBoundsForRange(0, 6).ToString());
|
| + static_text_accessible->GetPageBoundsForRange(0, 6).ToString());
|
|
|
| EXPECT_EQ(gfx::Rect(100, 100, 10, 20).ToString(),
|
| - static_text_accessible->GetLocalBoundsForRange(0, 1).ToString());
|
| + static_text_accessible->GetPageBoundsForRange(0, 1).ToString());
|
|
|
| EXPECT_EQ(gfx::Rect(100, 100, 30, 20).ToString(),
|
| - static_text_accessible->GetLocalBoundsForRange(0, 3).ToString());
|
| + static_text_accessible->GetPageBoundsForRange(0, 3).ToString());
|
|
|
| EXPECT_EQ(gfx::Rect(150, 100, 10, 20).ToString(),
|
| - static_text_accessible->GetLocalBoundsForRange(3, 1).ToString());
|
| + static_text_accessible->GetPageBoundsForRange(3, 1).ToString());
|
|
|
| EXPECT_EQ(gfx::Rect(130, 100, 30, 20).ToString(),
|
| - static_text_accessible->GetLocalBoundsForRange(3, 3).ToString());
|
| + static_text_accessible->GetPageBoundsForRange(3, 3).ToString());
|
|
|
| // This range is only two characters, but because of the direction switch
|
| // the bounds are as wide as four characters.
|
| EXPECT_EQ(gfx::Rect(120, 100, 40, 20).ToString(),
|
| - static_text_accessible->GetLocalBoundsForRange(2, 2).ToString());
|
| + static_text_accessible->GetPageBoundsForRange(2, 2).ToString());
|
| }
|
|
|
| TEST(BrowserAccessibilityManagerTest, BoundsForRangeScrolledWindow) {
|
| @@ -942,10 +942,10 @@ TEST(BrowserAccessibilityManagerTest, BoundsForRangeScrolledWindow) {
|
|
|
| if (manager->UseRootScrollOffsetsWhenComputingBounds()) {
|
| EXPECT_EQ(gfx::Rect(75, 50, 16, 9).ToString(),
|
| - static_text_accessible->GetLocalBoundsForRange(0, 3).ToString());
|
| + static_text_accessible->GetPageBoundsForRange(0, 3).ToString());
|
| } else {
|
| EXPECT_EQ(gfx::Rect(100, 100, 16, 9).ToString(),
|
| - static_text_accessible->GetLocalBoundsForRange(0, 3).ToString());
|
| + static_text_accessible->GetPageBoundsForRange(0, 3).ToString());
|
| }
|
| }
|
|
|
| @@ -1020,22 +1020,22 @@ TEST(BrowserAccessibilityManagerTest, BoundsForRangeOnParentElement) {
|
| ASSERT_NE(nullptr, div_accessible);
|
|
|
| EXPECT_EQ(gfx::Rect(100, 100, 20, 20).ToString(),
|
| - div_accessible->GetLocalBoundsForRange(0, 1).ToString());
|
| + div_accessible->GetPageBoundsForRange(0, 1).ToString());
|
|
|
| EXPECT_EQ(gfx::Rect(100, 100, 40, 20).ToString(),
|
| - div_accessible->GetLocalBoundsForRange(0, 2).ToString());
|
| + div_accessible->GetPageBoundsForRange(0, 2).ToString());
|
|
|
| EXPECT_EQ(gfx::Rect(100, 100, 80, 20).ToString(),
|
| - div_accessible->GetLocalBoundsForRange(0, 4).ToString());
|
| + div_accessible->GetPageBoundsForRange(0, 4).ToString());
|
|
|
| EXPECT_EQ(gfx::Rect(120, 100, 60, 20).ToString(),
|
| - div_accessible->GetLocalBoundsForRange(1, 3).ToString());
|
| + div_accessible->GetPageBoundsForRange(1, 3).ToString());
|
|
|
| EXPECT_EQ(gfx::Rect(120, 100, 80, 20).ToString(),
|
| - div_accessible->GetLocalBoundsForRange(1, 4).ToString());
|
| + div_accessible->GetPageBoundsForRange(1, 4).ToString());
|
|
|
| EXPECT_EQ(gfx::Rect(100, 100, 100, 20).ToString(),
|
| - div_accessible->GetLocalBoundsForRange(0, 5).ToString());
|
| + div_accessible->GetPageBoundsForRange(0, 5).ToString());
|
| }
|
|
|
| TEST(BrowserAccessibilityManagerTest, TestNextPreviousInTreeOrder) {
|
|
|