| 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 bb214c590ee39e586ca8c6316b0e18a6d4f6cf16..75342b4edfa565b4714efa2897e9e339576452c4 100644
|
| --- a/content/browser/accessibility/browser_accessibility_manager_unittest.cc
|
| +++ b/content/browser/accessibility/browser_accessibility_manager_unittest.cc
|
| @@ -642,14 +642,14 @@ TEST(BrowserAccessibilityManagerTest, BoundsForRange) {
|
| static_text.id = 2;
|
| static_text.SetName("Hello, world.");
|
| static_text.role = ui::AX_ROLE_STATIC_TEXT;
|
| - static_text.location = gfx::Rect(100, 100, 29, 18);
|
| + static_text.location = gfx::RectF(100, 100, 29, 18);
|
| root.child_ids.push_back(2);
|
|
|
| ui::AXNodeData inline_text1;
|
| inline_text1.id = 3;
|
| inline_text1.SetName("Hello, ");
|
| inline_text1.role = ui::AX_ROLE_INLINE_TEXT_BOX;
|
| - inline_text1.location = gfx::Rect(100, 100, 29, 9);
|
| + inline_text1.location = gfx::RectF(100, 100, 29, 9);
|
| inline_text1.AddIntAttribute(ui::AX_ATTR_TEXT_DIRECTION,
|
| ui::AX_TEXT_DIRECTION_LTR);
|
| std::vector<int32_t> character_offsets1;
|
| @@ -668,7 +668,7 @@ TEST(BrowserAccessibilityManagerTest, BoundsForRange) {
|
| inline_text2.id = 4;
|
| inline_text2.SetName("world.");
|
| inline_text2.role = ui::AX_ROLE_INLINE_TEXT_BOX;
|
| - inline_text2.location = gfx::Rect(100, 109, 28, 9);
|
| + inline_text2.location = gfx::RectF(100, 109, 28, 9);
|
| inline_text2.AddIntAttribute(ui::AX_ATTR_TEXT_DIRECTION,
|
| ui::AX_TEXT_DIRECTION_LTR);
|
| std::vector<int32_t> character_offsets2;
|
| @@ -735,14 +735,14 @@ TEST(BrowserAccessibilityManagerTest, BoundsForRangeBiDi) {
|
| static_text.id = 2;
|
| static_text.SetName("123abc");
|
| static_text.role = ui::AX_ROLE_STATIC_TEXT;
|
| - static_text.location = gfx::Rect(100, 100, 60, 20);
|
| + static_text.location = gfx::RectF(100, 100, 60, 20);
|
| root.child_ids.push_back(2);
|
|
|
| ui::AXNodeData inline_text1;
|
| inline_text1.id = 3;
|
| inline_text1.SetName("123");
|
| inline_text1.role = ui::AX_ROLE_INLINE_TEXT_BOX;
|
| - inline_text1.location = gfx::Rect(100, 100, 30, 20);
|
| + inline_text1.location = gfx::RectF(100, 100, 30, 20);
|
| inline_text1.AddIntAttribute(ui::AX_ATTR_TEXT_DIRECTION,
|
| ui::AX_TEXT_DIRECTION_LTR);
|
| std::vector<int32_t> character_offsets1;
|
| @@ -757,7 +757,7 @@ TEST(BrowserAccessibilityManagerTest, BoundsForRangeBiDi) {
|
| inline_text2.id = 4;
|
| inline_text2.SetName("abc");
|
| inline_text2.role = ui::AX_ROLE_INLINE_TEXT_BOX;
|
| - inline_text2.location = gfx::Rect(130, 100, 30, 20);
|
| + inline_text2.location = gfx::RectF(130, 100, 30, 20);
|
| inline_text2.AddIntAttribute(ui::AX_ATTR_TEXT_DIRECTION,
|
| ui::AX_TEXT_DIRECTION_RTL);
|
| std::vector<int32_t> character_offsets2;
|
| @@ -811,14 +811,14 @@ TEST(BrowserAccessibilityManagerTest, BoundsForRangeScrolledWindow) {
|
| static_text.id = 2;
|
| static_text.SetName("ABC");
|
| static_text.role = ui::AX_ROLE_STATIC_TEXT;
|
| - static_text.location = gfx::Rect(100, 100, 16, 9);
|
| + static_text.location = gfx::RectF(100, 100, 16, 9);
|
| root.child_ids.push_back(2);
|
|
|
| ui::AXNodeData inline_text;
|
| inline_text.id = 3;
|
| inline_text.SetName("ABC");
|
| inline_text.role = ui::AX_ROLE_INLINE_TEXT_BOX;
|
| - inline_text.location = gfx::Rect(100, 100, 16, 9);
|
| + inline_text.location = gfx::RectF(100, 100, 16, 9);
|
| inline_text.AddIntAttribute(ui::AX_ATTR_TEXT_DIRECTION,
|
| ui::AX_TEXT_DIRECTION_LTR);
|
| std::vector<int32_t> character_offsets1;
|
| @@ -858,7 +858,7 @@ TEST(BrowserAccessibilityManagerTest, BoundsForRangeOnParentElement) {
|
| ui::AXNodeData div;
|
| div.id = 2;
|
| div.role = ui::AX_ROLE_DIV;
|
| - div.location = gfx::Rect(100, 100, 100, 20);
|
| + div.location = gfx::RectF(100, 100, 100, 20);
|
| div.child_ids.push_back(3);
|
| div.child_ids.push_back(4);
|
| div.child_ids.push_back(5);
|
| @@ -867,27 +867,27 @@ TEST(BrowserAccessibilityManagerTest, BoundsForRangeOnParentElement) {
|
| static_text1.id = 3;
|
| static_text1.SetName("AB");
|
| static_text1.role = ui::AX_ROLE_STATIC_TEXT;
|
| - static_text1.location = gfx::Rect(100, 100, 40, 20);
|
| + static_text1.location = gfx::RectF(100, 100, 40, 20);
|
| static_text1.child_ids.push_back(6);
|
|
|
| ui::AXNodeData img;
|
| img.id = 4;
|
| img.SetName("Test image");
|
| img.role = ui::AX_ROLE_IMAGE;
|
| - img.location = gfx::Rect(140, 100, 20, 20);
|
| + img.location = gfx::RectF(140, 100, 20, 20);
|
|
|
| ui::AXNodeData static_text2;
|
| static_text2.id = 5;
|
| static_text2.SetName("CD");
|
| static_text2.role = ui::AX_ROLE_STATIC_TEXT;
|
| - static_text2.location = gfx::Rect(160, 100, 40, 20);
|
| + static_text2.location = gfx::RectF(160, 100, 40, 20);
|
| static_text2.child_ids.push_back(7);
|
|
|
| ui::AXNodeData inline_text1;
|
| inline_text1.id = 6;
|
| inline_text1.SetName("AB");
|
| inline_text1.role = ui::AX_ROLE_INLINE_TEXT_BOX;
|
| - inline_text1.location = gfx::Rect(100, 100, 40, 20);
|
| + inline_text1.location = gfx::RectF(100, 100, 40, 20);
|
| inline_text1.AddIntAttribute(ui::AX_ATTR_TEXT_DIRECTION,
|
| ui::AX_TEXT_DIRECTION_LTR);
|
| std::vector<int32_t> character_offsets1;
|
| @@ -900,7 +900,7 @@ TEST(BrowserAccessibilityManagerTest, BoundsForRangeOnParentElement) {
|
| inline_text2.id = 7;
|
| inline_text2.SetName("CD");
|
| inline_text2.role = ui::AX_ROLE_INLINE_TEXT_BOX;
|
| - inline_text2.location = gfx::Rect(160, 100, 40, 20);
|
| + inline_text2.location = gfx::RectF(160, 100, 40, 20);
|
| inline_text2.AddIntAttribute(ui::AX_ATTR_TEXT_DIRECTION,
|
| ui::AX_TEXT_DIRECTION_LTR);
|
| std::vector<int32_t> character_offsets2;
|
|
|