| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/string16.h" | 5 #include "base/string16.h" |
| 6 #include "base/utf_string_conversions.h" | 6 #include "base/utf_string_conversions.h" |
| 7 #include "content/browser/accessibility/browser_accessibility.h" | 7 #include "content/browser/accessibility/browser_accessibility.h" |
| 8 #include "content/browser/accessibility/browser_accessibility_manager.h" | 8 #include "content/browser/accessibility/browser_accessibility_manager.h" |
| 9 #include "content/common/view_messages.h" | 9 #include "content/common/view_messages.h" |
| 10 #include "testing/gtest/include/gtest/gtest.h" | 10 #include "testing/gtest/include/gtest/gtest.h" |
| (...skipping 586 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 597 // And the proper child remains. | 597 // And the proper child remains. |
| 598 EXPECT_EQ(WebAccessibility::ROLE_TEXT_FIELD, acc1_2->role()); | 598 EXPECT_EQ(WebAccessibility::ROLE_TEXT_FIELD, acc1_2->role()); |
| 599 EXPECT_EQ(1001, acc1_2->renderer_id()); | 599 EXPECT_EQ(1001, acc1_2->renderer_id()); |
| 600 | 600 |
| 601 // Tree with a child button. | 601 // Tree with a child button. |
| 602 WebAccessibility tree2_1; | 602 WebAccessibility tree2_1; |
| 603 tree2_1.id = 1000; | 603 tree2_1.id = 1000; |
| 604 tree2_1.role = WebAccessibility::ROLE_WEB_AREA; | 604 tree2_1.role = WebAccessibility::ROLE_WEB_AREA; |
| 605 | 605 |
| 606 WebAccessibility tree2_2; | 606 WebAccessibility tree2_2; |
| 607 tree2_2.id = 1002; | 607 tree2_2.id = 1001; |
| 608 tree2_2.role = WebAccessibility::ROLE_BUTTON; | 608 tree2_2.role = WebAccessibility::ROLE_BUTTON; |
| 609 | 609 |
| 610 tree2_1.children.push_back(tree2_2); | 610 tree2_1.children.push_back(tree2_2); |
| 611 | 611 |
| 612 msg->acc_obj = tree2_1; | 612 msg->acc_obj = tree2_1; |
| 613 | 613 |
| 614 // Fire another load complete. | 614 // Fire another load complete. |
| 615 manager->OnAccessibilityNotifications(params); | 615 manager->OnAccessibilityNotifications(params); |
| 616 | 616 |
| 617 BrowserAccessibility* acc2_2 = manager->GetFromRendererID(1002); | 617 BrowserAccessibility* acc2_2 = manager->GetFromRendererID(1001); |
| 618 | 618 |
| 619 // Verify the root has not changed. | 619 // Verify the root has not changed. |
| 620 EXPECT_EQ(root, manager->GetRoot()); | 620 EXPECT_EQ(root, manager->GetRoot()); |
| 621 | 621 |
| 622 // And the new child exists. | 622 // And the proper child remains. |
| 623 EXPECT_EQ(WebAccessibility::ROLE_BUTTON, acc2_2->role()); | 623 EXPECT_EQ(WebAccessibility::ROLE_BUTTON, acc2_2->role()); |
| 624 EXPECT_EQ(1002, acc2_2->renderer_id()); | 624 EXPECT_EQ(1001, acc2_2->renderer_id()); |
| 625 |
| 626 // Verify we don't reuse objects that have changed roles. |
| 627 EXPECT_NE(acc1_2, acc2_2); |
| 625 | 628 |
| 626 // Ensure we properly cleaned up. | 629 // Ensure we properly cleaned up. |
| 627 manager.reset(); | 630 manager.reset(); |
| 628 ASSERT_EQ(0, CountedBrowserAccessibility::global_obj_count_); | 631 ASSERT_EQ(0, CountedBrowserAccessibility::global_obj_count_); |
| 629 } | 632 } |
| OLD | NEW |