summaryrefslogtreecommitdiffstats
path: root/chromium/content/renderer/accessibility/renderer_accessibility_browsertest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/content/renderer/accessibility/renderer_accessibility_browsertest.cc')
-rw-r--r--chromium/content/renderer/accessibility/renderer_accessibility_browsertest.cc233
1 files changed, 123 insertions, 110 deletions
diff --git a/chromium/content/renderer/accessibility/renderer_accessibility_browsertest.cc b/chromium/content/renderer/accessibility/renderer_accessibility_browsertest.cc
index 6cc5550c7e7..9aa4b28e683 100644
--- a/chromium/content/renderer/accessibility/renderer_accessibility_browsertest.cc
+++ b/chromium/content/renderer/accessibility/renderer_accessibility_browsertest.cc
@@ -3,8 +3,8 @@
// found in the LICENSE file.
#include "base/strings/utf_string_conversions.h"
-#include "content/common/accessibility_node_data.h"
-#include "content/common/view_messages.h"
+#include "content/common/frame_messages.h"
+#include "content/common/view_message_enums.h"
#include "content/public/test/render_view_test.h"
#include "content/renderer/accessibility/renderer_accessibility_complete.h"
#include "content/renderer/render_view_impl.h"
@@ -13,6 +13,7 @@
#include "third_party/WebKit/public/web/WebAXObject.h"
#include "third_party/WebKit/public/web/WebDocument.h"
#include "third_party/WebKit/public/web/WebView.h"
+#include "ui/accessibility/ax_node_data.h"
using blink::WebAXObject;
using blink::WebDocument;
@@ -22,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 {
@@ -62,6 +39,10 @@ class RendererAccessibilityTest : public RenderViewTest {
return static_cast<RenderViewImpl*>(view_);
}
+ RenderFrameImpl* frame() {
+ return static_cast<RenderFrameImpl*>(view()->GetMainRenderFrame());
+ }
+
virtual void SetUp() {
RenderViewTest::SetUp();
sink_ = &render_thread_->sink();
@@ -85,13 +66,14 @@ class RendererAccessibilityTest : public RenderViewTest {
int CountAccessibilityNodesSentToBrowser() {
AccessibilityHostMsg_EventParams event;
GetLastAccEvent(&event);
- return event.nodes.size();
+ return event.update.nodes.size();
}
protected:
IPC::TestSink* sink_;
DISALLOW_COPY_AND_ASSIGN(RendererAccessibilityTest);
+
};
TEST_F(RendererAccessibilityTest, EditableTextModeFocusEvents) {
@@ -125,17 +107,17 @@ TEST_F(RendererAccessibilityTest, EditableTextModeFocusEvents) {
AccessibilityHostMsg_EventParams event;
GetLastAccEvent(&event);
EXPECT_EQ(event.event_type,
- blink::WebAXEventLayoutComplete);
+ 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,
- blink::WebAXRoleRootWebArea);
- EXPECT_EQ(event.nodes[0].state,
- (1U << blink::WebAXStateReadonly) |
- (1U << blink::WebAXStateFocusable) |
- (1U << blink::WebAXStateFocused));
- EXPECT_EQ(event.nodes[0].child_ids.size(), 1U);
+ 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.update.nodes[0].state,
+ (1U << ui::AX_STATE_READ_ONLY) |
+ (1U << ui::AX_STATE_FOCUSABLE) |
+ (1U << ui::AX_STATE_FOCUSED));
+ EXPECT_EQ(event.update.nodes[0].child_ids.size(), 1U);
}
// Now focus the input element, and check everything again.
@@ -146,21 +128,21 @@ TEST_F(RendererAccessibilityTest, EditableTextModeFocusEvents) {
AccessibilityHostMsg_EventParams event;
GetLastAccEvent(&event);
EXPECT_EQ(event.event_type,
- blink::WebAXEventFocus);
+ ui::AX_EVENT_FOCUS);
EXPECT_EQ(event.id, 3);
- EXPECT_EQ(event.nodes[0].id, 1);
- EXPECT_EQ(event.nodes[0].role,
- blink::WebAXRoleRootWebArea);
- EXPECT_EQ(event.nodes[0].state,
- (1U << blink::WebAXStateReadonly) |
- (1U << blink::WebAXStateFocusable));
- EXPECT_EQ(event.nodes[0].child_ids.size(), 1U);
- EXPECT_EQ(event.nodes[1].id, 3);
- EXPECT_EQ(event.nodes[1].role,
- blink::WebAXRoleGroup);
- EXPECT_EQ(event.nodes[1].state,
- (1U << blink::WebAXStateFocusable) |
- (1U << blink::WebAXStateFocused));
+ EXPECT_EQ(event.update.nodes[0].id, 1);
+ EXPECT_EQ(event.update.nodes[0].role,
+ ui::AX_ROLE_ROOT_WEB_AREA);
+ EXPECT_EQ(event.update.nodes[0].state,
+ (1U << ui::AX_STATE_READ_ONLY) |
+ (1U << ui::AX_STATE_FOCUSABLE));
+ 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.update.nodes[1].state,
+ (1U << ui::AX_STATE_FOCUSABLE) |
+ (1U << ui::AX_STATE_FOCUSED));
}
// Check other editable text nodes.
@@ -171,9 +153,9 @@ TEST_F(RendererAccessibilityTest, EditableTextModeFocusEvents) {
AccessibilityHostMsg_EventParams event;
GetLastAccEvent(&event);
EXPECT_EQ(event.id, 4);
- EXPECT_EQ(event.nodes[1].state,
- (1U << blink::WebAXStateFocusable) |
- (1U << blink::WebAXStateFocused));
+ EXPECT_EQ(event.update.nodes[1].state,
+ (1U << ui::AX_STATE_FOCUSABLE) |
+ (1U << ui::AX_STATE_FOCUSED));
}
{
@@ -183,9 +165,9 @@ TEST_F(RendererAccessibilityTest, EditableTextModeFocusEvents) {
AccessibilityHostMsg_EventParams event;
GetLastAccEvent(&event);
EXPECT_EQ(event.id, 5);
- EXPECT_EQ(event.nodes[1].state,
- (1U << blink::WebAXStateFocusable) |
- (1U << blink::WebAXStateFocused));
+ EXPECT_EQ(event.update.nodes[1].state,
+ (1U << ui::AX_STATE_FOCUSABLE) |
+ (1U << ui::AX_STATE_FOCUSED));
}
{
@@ -195,9 +177,9 @@ TEST_F(RendererAccessibilityTest, EditableTextModeFocusEvents) {
AccessibilityHostMsg_EventParams event;
GetLastAccEvent(&event);
EXPECT_EQ(event.id, 6);
- EXPECT_EQ(event.nodes[1].state,
- (1U << blink::WebAXStateFocusable) |
- (1U << blink::WebAXStateFocused));
+ EXPECT_EQ(event.update.nodes[1].state,
+ (1U << ui::AX_STATE_FOCUSABLE) |
+ (1U << ui::AX_STATE_FOCUSED));
}
// Try focusing things that aren't editable text.
@@ -208,10 +190,10 @@ TEST_F(RendererAccessibilityTest, EditableTextModeFocusEvents) {
AccessibilityHostMsg_EventParams event;
GetLastAccEvent(&event);
EXPECT_EQ(event.id, 7);
- EXPECT_EQ(event.nodes[1].state,
- (1U << blink::WebAXStateFocusable) |
- (1U << blink::WebAXStateFocused) |
- (1U << blink::WebAXStateReadonly));
+ EXPECT_EQ(event.update.nodes[1].state,
+ (1U << ui::AX_STATE_FOCUSABLE) |
+ (1U << ui::AX_STATE_FOCUSED) |
+ (1U << ui::AX_STATE_READ_ONLY));
}
{
@@ -221,10 +203,10 @@ TEST_F(RendererAccessibilityTest, EditableTextModeFocusEvents) {
AccessibilityHostMsg_EventParams event;
GetLastAccEvent(&event);
EXPECT_EQ(event.id, 8);
- EXPECT_EQ(event.nodes[1].state,
- (1U << blink::WebAXStateFocusable) |
- (1U << blink::WebAXStateFocused) |
- (1U << blink::WebAXStateReadonly));
+ EXPECT_EQ(event.update.nodes[1].state,
+ (1U << ui::AX_STATE_FOCUSABLE) |
+ (1U << ui::AX_STATE_FOCUSED) |
+ (1U << ui::AX_STATE_READ_ONLY));
}
// Clear focus.
@@ -259,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,
@@ -267,17 +248,16 @@ TEST_F(RendererAccessibilityTest, SendFullAccessibilityTreeOnReload) {
sink_->ClearMessages();
WebDocument document = view()->GetWebView()->mainFrame()->document();
WebAXObject root_obj = document.accessibilityObject();
- accessibility->HandleWebAccessibilityEvent(
+ accessibility->HandleAXEvent(
root_obj,
- blink::WebAXEventLayoutComplete);
+ 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
@@ -287,11 +267,10 @@ TEST_F(RendererAccessibilityTest, SendFullAccessibilityTreeOnReload) {
document = view()->GetWebView()->mainFrame()->document();
root_obj = document.accessibilityObject();
sink_->ClearMessages();
- accessibility->HandleWebAccessibilityEvent(
+ accessibility->HandleAXEvent(
root_obj,
- blink::WebAXEventLayoutComplete);
+ 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
@@ -302,11 +281,10 @@ TEST_F(RendererAccessibilityTest, SendFullAccessibilityTreeOnReload) {
root_obj = document.accessibilityObject();
sink_->ClearMessages();
const WebAXObject& first_child = root_obj.childAt(0);
- accessibility->HandleWebAccessibilityEvent(
+ accessibility->HandleAXEvent(
first_child,
- blink::WebAXEventLiveRegionChanged);
+ ui::AX_EVENT_LIVE_REGION_CHANGED);
accessibility->SendPendingAccessibilityEvents();
- EXPECT_EQ(4, accessibility->browser_tree_node_count());
EXPECT_EQ(4, CountAccessibilityNodesSentToBrowser());
}
@@ -326,13 +304,13 @@ TEST_F(RendererAccessibilityTest,
" <p>Hello, world.</p>"
"</body>";
LoadHTML(html.c_str());
+ static const int kProxyRoutingId = 13;
// Creating a RendererAccessibilityComplete should send the tree
// to the browser.
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
@@ -341,10 +319,10 @@ TEST_F(RendererAccessibilityTest,
sink_->ClearMessages();
WebDocument document = view()->GetWebView()->mainFrame()->document();
WebAXObject root_obj = document.accessibilityObject();
- accessibility->HandleWebAccessibilityEvent(
+ accessibility->HandleAXEvent(
root_obj,
- blink::WebAXEventValueChanged);
- view()->OnSwapOut();
+ ui::AX_EVENT_VALUE_CHANGED);
+ view()->main_render_frame()->OnSwapOut(kProxyRoutingId);
accessibility->SendPendingAccessibilityEvents();
EXPECT_FALSE(sink_->GetUniqueMessageMatching(
AccessibilityHostMsg_Events::ID));
@@ -354,15 +332,15 @@ TEST_F(RendererAccessibilityTest,
// message that was queued up before will be quickly discarded
// because the element it was referring to no longer exists,
// so the event here is from loading this new page.
- ViewMsg_Navigate_Params nav_params;
+ FrameMsg_Navigate_Params nav_params;
nav_params.url = GURL("data:text/html,<p>Hello, again.</p>");
- nav_params.navigation_type = ViewMsg_Navigate_Type::NORMAL;
+ nav_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
nav_params.transition = PAGE_TRANSITION_TYPED;
nav_params.current_history_list_length = 1;
nav_params.current_history_list_offset = 0;
nav_params.pending_history_list_offset = 1;
nav_params.page_id = -1;
- view()->OnNavigate(nav_params);
+ frame()->OnNavigate(nav_params);
accessibility->SendPendingAccessibilityEvents();
EXPECT_TRUE(sink_->GetUniqueMessageMatching(
AccessibilityHostMsg_Events::ID));
@@ -386,7 +364,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();
@@ -403,23 +380,21 @@ TEST_F(RendererAccessibilityTest, HideAccessibilityObject) {
// Send a childrenChanged on 'A'.
sink_->ClearMessages();
- accessibility->HandleWebAccessibilityEvent(
+ accessibility->HandleAXEvent(
node_a,
- blink::WebAXEventChildrenChanged);
+ 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) {
@@ -441,7 +416,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'.
@@ -453,15 +427,22 @@ TEST_F(RendererAccessibilityTest, ShowAccessibilityObject) {
WebDocument document = view()->GetWebView()->mainFrame()->document();
WebAXObject root_obj = document.accessibilityObject();
WebAXObject node_a = root_obj.childAt(0);
- accessibility->HandleWebAccessibilityEvent(
+ WebAXObject node_b = node_a.childAt(0);
+ WebAXObject node_c = node_b.childAt(0);
+
+ accessibility->HandleAXEvent(
node_a,
- blink::WebAXEventChildrenChanged);
+ 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());
}
@@ -479,7 +460,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:
@@ -507,9 +487,9 @@ TEST_F(RendererAccessibilityTest, DetachAccessibilityObject) {
// Send a childrenChanged on the body.
sink_->ClearMessages();
- accessibility->HandleWebAccessibilityEvent(
+ accessibility->HandleAXEvent(
body,
- blink::WebAXEventChildrenChanged);
+ ui::AX_EVENT_CHILDREN_CHANGED);
accessibility->SendPendingAccessibilityEvents();
@@ -526,16 +506,49 @@ 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.
}
+TEST_F(RendererAccessibilityTest, EventOnObjectNotInTree) {
+ // Test RendererAccessibilityComplete and make sure it doesn't send anything
+ // if we get a notification from Blink for an object that isn't in the
+ // tree, like the scroll area that's the parent of the main document,
+ // which we don't expose.
+ std::string html = "<body><input></body>";
+ LoadHTML(html.c_str());
+
+ scoped_ptr<TestRendererAccessibilityComplete> accessibility(
+ new TestRendererAccessibilityComplete(view()));
+ accessibility->SendPendingAccessibilityEvents();
+ EXPECT_EQ(3, CountAccessibilityNodesSentToBrowser());
+
+ WebDocument document = view()->GetWebView()->mainFrame()->document();
+ WebAXObject root_obj = document.accessibilityObject();
+ WebAXObject scroll_area = root_obj.parentObject();
+ EXPECT_EQ(blink::WebAXRoleScrollArea, scroll_area.role());
+
+ // Try to fire a message on the scroll area, and assert that we just
+ // ignore it.
+ sink_->ClearMessages();
+ accessibility->HandleAXEvent(scroll_area,
+ ui::AX_EVENT_VALUE_CHANGED);
+
+ accessibility->SendPendingAccessibilityEvents();
+
+ const IPC::Message* message =
+ sink_->GetUniqueMessageMatching(AccessibilityHostMsg_Events::ID);
+ ASSERT_TRUE(message);
+ Tuple1<std::vector<AccessibilityHostMsg_EventParams> > param;
+ AccessibilityHostMsg_Events::Read(message, &param);
+ ASSERT_EQ(0U, param.a.size());
+}
+
} // namespace content
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 11:57:12 +0000