Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1537)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/renderer/accessibility/renderer_accessibility_browsertest.cc

Issue 125763003: Refactor content/renderer/accessibility to use AXTreeSerializer (re-land). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix memory leaks Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/accessibility/blink_ax_tree_source.cc ('k') | content/renderer/accessibility/renderer_accessibility_complete.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/accessibility/renderer_accessibility_browsertest.cc
diff --git a/content/renderer/accessibility/renderer_accessibility_browsertest.cc b/content/renderer/accessibility/renderer_accessibility_browsertest.cc
index 95f2c42a61a1d4d6da89a650756e2c932cd648b6..f1b559b4ae504f1d1662c142f0076695e8698a5d 100644
--- a/content/renderer/accessibility/renderer_accessibility_browsertest.cc
+++ b/content/renderer/accessibility/renderer_accessibility_browsertest.cc
@@ -23,36 +23,12 @@ namespace content {
class TestRendererAccessibilityComplete : public RendererAccessibilityComplete {
public:
explicit TestRendererAccessibilityComplete(RenderViewImpl* render_view)
- : RendererAccessibilityComplete(render_view),
- browser_tree_node_count_(0) {
- }
-
- int browser_tree_node_count() { return browser_tree_node_count_; }
-
- struct TestBrowserTreeNode : public BrowserTreeNode {
- TestBrowserTreeNode(TestRendererAccessibilityComplete* owner)
- : owner_(owner) {
- owner_->browser_tree_node_count_++;
- }
-
- virtual ~TestBrowserTreeNode() {
- owner_->browser_tree_node_count_--;
- }
-
- private:
- TestRendererAccessibilityComplete* owner_;
- };
-
- virtual BrowserTreeNode* CreateBrowserTreeNode() OVERRIDE {
- return new TestBrowserTreeNode(this);
+ : RendererAccessibilityComplete(render_view) {
}
void SendPendingAccessibilityEvents() {
RendererAccessibilityComplete::SendPendingAccessibilityEvents();
}
-
-private:
- int browser_tree_node_count_;
};
class RendererAccessibilityTest : public RenderViewTest {
@@ -90,7 +66,7 @@ class RendererAccessibilityTest : public RenderViewTest {
int CountAccessibilityNodesSentToBrowser() {
AccessibilityHostMsg_EventParams event;
GetLastAccEvent(&event);
- return event.nodes.size();
+ return event.update.nodes.size();
}
protected:
@@ -133,15 +109,15 @@ TEST_F(RendererAccessibilityTest, EditableTextModeFocusEvents) {
EXPECT_EQ(event.event_type,
ui::AX_EVENT_LAYOUT_COMPLETE);
EXPECT_EQ(event.id, 1);
- EXPECT_EQ(event.nodes.size(), 2U);
- EXPECT_EQ(event.nodes[0].id, 1);
- EXPECT_EQ(event.nodes[0].role,
+ EXPECT_EQ(event.update.nodes.size(), 2U);
+ EXPECT_EQ(event.update.nodes[0].id, 1);
+ EXPECT_EQ(event.update.nodes[0].role,
ui::AX_ROLE_ROOT_WEB_AREA);
- EXPECT_EQ(event.nodes[0].state,
+ EXPECT_EQ(event.update.nodes[0].state,
(1U << ui::AX_STATE_READ_ONLY) |
(1U << ui::AX_STATE_FOCUSABLE) |
(1U << ui::AX_STATE_FOCUSED));
- EXPECT_EQ(event.nodes[0].child_ids.size(), 1U);
+ EXPECT_EQ(event.update.nodes[0].child_ids.size(), 1U);
}
// Now focus the input element, and check everything again.
@@ -154,17 +130,17 @@ TEST_F(RendererAccessibilityTest, EditableTextModeFocusEvents) {
EXPECT_EQ(event.event_type,
ui::AX_EVENT_FOCUS);
EXPECT_EQ(event.id, 3);
- EXPECT_EQ(event.nodes[0].id, 1);
- EXPECT_EQ(event.nodes[0].role,
+ EXPECT_EQ(event.update.nodes[0].id, 1);
+ EXPECT_EQ(event.update.nodes[0].role,
ui::AX_ROLE_ROOT_WEB_AREA);
- EXPECT_EQ(event.nodes[0].state,
+ EXPECT_EQ(event.update.nodes[0].state,
(1U << ui::AX_STATE_READ_ONLY) |
(1U << ui::AX_STATE_FOCUSABLE));
- EXPECT_EQ(event.nodes[0].child_ids.size(), 1U);
- EXPECT_EQ(event.nodes[1].id, 3);
- EXPECT_EQ(event.nodes[1].role,
+ EXPECT_EQ(event.update.nodes[0].child_ids.size(), 1U);
+ EXPECT_EQ(event.update.nodes[1].id, 3);
+ EXPECT_EQ(event.update.nodes[1].role,
ui::AX_ROLE_GROUP);
- EXPECT_EQ(event.nodes[1].state,
+ EXPECT_EQ(event.update.nodes[1].state,
(1U << ui::AX_STATE_FOCUSABLE) |
(1U << ui::AX_STATE_FOCUSED));
}
@@ -177,7 +153,7 @@ TEST_F(RendererAccessibilityTest, EditableTextModeFocusEvents) {
AccessibilityHostMsg_EventParams event;
GetLastAccEvent(&event);
EXPECT_EQ(event.id, 4);
- EXPECT_EQ(event.nodes[1].state,
+ EXPECT_EQ(event.update.nodes[1].state,
(1U << ui::AX_STATE_FOCUSABLE) |
(1U << ui::AX_STATE_FOCUSED));
}
@@ -189,7 +165,7 @@ TEST_F(RendererAccessibilityTest, EditableTextModeFocusEvents) {
AccessibilityHostMsg_EventParams event;
GetLastAccEvent(&event);
EXPECT_EQ(event.id, 5);
- EXPECT_EQ(event.nodes[1].state,
+ EXPECT_EQ(event.update.nodes[1].state,
(1U << ui::AX_STATE_FOCUSABLE) |
(1U << ui::AX_STATE_FOCUSED));
}
@@ -201,7 +177,7 @@ TEST_F(RendererAccessibilityTest, EditableTextModeFocusEvents) {
AccessibilityHostMsg_EventParams event;
GetLastAccEvent(&event);
EXPECT_EQ(event.id, 6);
- EXPECT_EQ(event.nodes[1].state,
+ EXPECT_EQ(event.update.nodes[1].state,
(1U << ui::AX_STATE_FOCUSABLE) |
(1U << ui::AX_STATE_FOCUSED));
}
@@ -214,7 +190,7 @@ TEST_F(RendererAccessibilityTest, EditableTextModeFocusEvents) {
AccessibilityHostMsg_EventParams event;
GetLastAccEvent(&event);
EXPECT_EQ(event.id, 7);
- EXPECT_EQ(event.nodes[1].state,
+ EXPECT_EQ(event.update.nodes[1].state,
(1U << ui::AX_STATE_FOCUSABLE) |
(1U << ui::AX_STATE_FOCUSED) |
(1U << ui::AX_STATE_READ_ONLY));
@@ -227,7 +203,7 @@ TEST_F(RendererAccessibilityTest, EditableTextModeFocusEvents) {
AccessibilityHostMsg_EventParams event;
GetLastAccEvent(&event);
EXPECT_EQ(event.id, 8);
- EXPECT_EQ(event.nodes[1].state,
+ EXPECT_EQ(event.update.nodes[1].state,
(1U << ui::AX_STATE_FOCUSABLE) |
(1U << ui::AX_STATE_FOCUSED) |
(1U << ui::AX_STATE_READ_ONLY));
@@ -265,7 +241,6 @@ TEST_F(RendererAccessibilityTest, SendFullAccessibilityTreeOnReload) {
scoped_ptr<TestRendererAccessibilityComplete> accessibility(
new TestRendererAccessibilityComplete(view()));
accessibility->SendPendingAccessibilityEvents();
- EXPECT_EQ(4, accessibility->browser_tree_node_count());
EXPECT_EQ(4, CountAccessibilityNodesSentToBrowser());
// If we post another event but the tree doesn't change,
@@ -277,13 +252,12 @@ TEST_F(RendererAccessibilityTest, SendFullAccessibilityTreeOnReload) {
root_obj,
ui::AX_EVENT_LAYOUT_COMPLETE);
accessibility->SendPendingAccessibilityEvents();
- EXPECT_EQ(4, accessibility->browser_tree_node_count());
EXPECT_EQ(1, CountAccessibilityNodesSentToBrowser());
{
// Make sure it's the root object that was updated.
AccessibilityHostMsg_EventParams event;
GetLastAccEvent(&event);
- EXPECT_EQ(root_obj.axID(), event.nodes[0].id);
+ EXPECT_EQ(root_obj.axID(), event.update.nodes[0].id);
}
// If we reload the page and send a event, we should send
@@ -297,7 +271,6 @@ TEST_F(RendererAccessibilityTest, SendFullAccessibilityTreeOnReload) {
root_obj,
ui::AX_EVENT_LAYOUT_COMPLETE);
accessibility->SendPendingAccessibilityEvents();
- EXPECT_EQ(4, accessibility->browser_tree_node_count());
EXPECT_EQ(4, CountAccessibilityNodesSentToBrowser());
// Even if the first event is sent on an element other than
@@ -312,7 +285,6 @@ TEST_F(RendererAccessibilityTest, SendFullAccessibilityTreeOnReload) {
first_child,
ui::AX_EVENT_LIVE_REGION_CHANGED);
accessibility->SendPendingAccessibilityEvents();
- EXPECT_EQ(4, accessibility->browser_tree_node_count());
EXPECT_EQ(4, CountAccessibilityNodesSentToBrowser());
}
@@ -338,7 +310,6 @@ TEST_F(RendererAccessibilityTest,
scoped_ptr<TestRendererAccessibilityComplete> accessibility(
new TestRendererAccessibilityComplete(view()));
accessibility->SendPendingAccessibilityEvents();
- EXPECT_EQ(5, accessibility->browser_tree_node_count());
EXPECT_EQ(5, CountAccessibilityNodesSentToBrowser());
// Post a "value changed" event, but then swap out
@@ -392,7 +363,6 @@ TEST_F(RendererAccessibilityTest, HideAccessibilityObject) {
scoped_ptr<TestRendererAccessibilityComplete> accessibility(
new TestRendererAccessibilityComplete(view()));
accessibility->SendPendingAccessibilityEvents();
- EXPECT_EQ(4, accessibility->browser_tree_node_count());
EXPECT_EQ(4, CountAccessibilityNodesSentToBrowser());
WebDocument document = view()->GetWebView()->mainFrame()->document();
@@ -414,18 +384,16 @@ TEST_F(RendererAccessibilityTest, HideAccessibilityObject) {
ui::AX_EVENT_CHILDREN_CHANGED);
accessibility->SendPendingAccessibilityEvents();
- EXPECT_EQ(3, accessibility->browser_tree_node_count());
AccessibilityHostMsg_EventParams event;
GetLastAccEvent(&event);
- ASSERT_EQ(3U, event.nodes.size());
+ ASSERT_EQ(2U, event.update.nodes.size());
// RendererAccessibilityComplete notices that 'C' is being reparented,
- // so it updates 'B' first to remove 'C' as a child, then 'A' to add it,
- // and finally it updates 'C'.
- EXPECT_EQ(node_b.axID(), event.nodes[0].id);
- EXPECT_EQ(node_a.axID(), event.nodes[1].id);
- EXPECT_EQ(node_c.axID(), event.nodes[2].id);
- EXPECT_EQ(3, CountAccessibilityNodesSentToBrowser());
+ // so it clears the subtree rooted at 'A', then updates 'A' and then 'C'.
+ EXPECT_EQ(node_a.axID(), event.update.node_id_to_clear);
+ EXPECT_EQ(node_a.axID(), event.update.nodes[0].id);
+ EXPECT_EQ(node_c.axID(), event.update.nodes[1].id);
+ EXPECT_EQ(2, CountAccessibilityNodesSentToBrowser());
}
TEST_F(RendererAccessibilityTest, ShowAccessibilityObject) {
@@ -447,7 +415,6 @@ TEST_F(RendererAccessibilityTest, ShowAccessibilityObject) {
scoped_ptr<TestRendererAccessibilityComplete> accessibility(
new TestRendererAccessibilityComplete(view()));
accessibility->SendPendingAccessibilityEvents();
- EXPECT_EQ(3, accessibility->browser_tree_node_count());
EXPECT_EQ(3, CountAccessibilityNodesSentToBrowser());
// Show node 'B', then send a childrenChanged on 'A'.
@@ -459,15 +426,22 @@ TEST_F(RendererAccessibilityTest, ShowAccessibilityObject) {
WebDocument document = view()->GetWebView()->mainFrame()->document();
WebAXObject root_obj = document.accessibilityObject();
WebAXObject node_a = root_obj.childAt(0);
+ WebAXObject node_b = node_a.childAt(0);
+ WebAXObject node_c = node_b.childAt(0);
+
accessibility->HandleAXEvent(
node_a,
ui::AX_EVENT_CHILDREN_CHANGED);
accessibility->SendPendingAccessibilityEvents();
- EXPECT_EQ(4, accessibility->browser_tree_node_count());
AccessibilityHostMsg_EventParams event;
GetLastAccEvent(&event);
- ASSERT_EQ(3U, event.nodes.size());
+
+ ASSERT_EQ(3U, event.update.nodes.size());
+ EXPECT_EQ(node_a.axID(), event.update.node_id_to_clear);
+ EXPECT_EQ(node_a.axID(), event.update.nodes[0].id);
+ EXPECT_EQ(node_b.axID(), event.update.nodes[1].id);
+ EXPECT_EQ(node_c.axID(), event.update.nodes[2].id);
EXPECT_EQ(3, CountAccessibilityNodesSentToBrowser());
}
@@ -485,7 +459,6 @@ TEST_F(RendererAccessibilityTest, DetachAccessibilityObject) {
scoped_ptr<TestRendererAccessibilityComplete> accessibility(
new TestRendererAccessibilityComplete(view()));
accessibility->SendPendingAccessibilityEvents();
- EXPECT_EQ(7, accessibility->browser_tree_node_count());
EXPECT_EQ(7, CountAccessibilityNodesSentToBrowser());
// Initially, the accessibility tree looks like this:
@@ -532,14 +505,13 @@ TEST_F(RendererAccessibilityTest, DetachAccessibilityObject) {
// accessibility tree and that only three nodes needed
// to be updated (the body, the static text 1, and
// the static text 2).
- EXPECT_EQ(6, accessibility->browser_tree_node_count());
AccessibilityHostMsg_EventParams event;
GetLastAccEvent(&event);
- ASSERT_EQ(5U, event.nodes.size());
+ ASSERT_EQ(5U, event.update.nodes.size());
- EXPECT_EQ(body.axID(), event.nodes[0].id);
- EXPECT_EQ(text_1.axID(), event.nodes[1].id);
+ EXPECT_EQ(body.axID(), event.update.nodes[0].id);
+ EXPECT_EQ(text_1.axID(), event.update.nodes[1].id);
// The third event is to update text_2, but its id changes
// so we don't have a test expectation for it.
}
« no previous file with comments | « content/renderer/accessibility/blink_ax_tree_source.cc ('k') | content/renderer/accessibility/renderer_accessibility_complete.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698