Add html node info (tag name, attributes, and computed display) and document

info (url, title, mimetype, doctype) to WebAccessibility.

BUG=none
TEST=Modified unit test: RenderMessagesUnittest.WebAccessibility
TEST=Added new browser test: RendererAccessibilityBrowserTest.TestCrossPlatformAccessibilityTree


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=57188
Review URL: http://codereview.chromium.org/3013035

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57866 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 17 insertions, 0 deletions

diff --git a/chrome/common/render_messages.cc b/chrome/common/render_messages.cc
index 1bc1116..df94855 100644
--- a/chrome/common/render_messages.cc
+++ b/chrome/common/render_messages.cc
@@ -793,6 +793,7 @@ void ParamTraits<webkit_glue::WebAccessibility>::Write(Message* m,
   WriteParam(m, p.location);
   WriteParam(m, p.attributes);
   WriteParam(m, p.children);
+  WriteParam(m, p.html_attributes);
 }
 
 bool ParamTraits<webkit_glue::WebAccessibility>::Read(
@@ -814,6 +815,7 @@ bool ParamTraits<webkit_glue::WebAccessibility>::Read(
   ret = ret && ReadParam(m, iter, &p->location);
   ret = ret && ReadParam(m, iter, &p->attributes);
   ret = ret && ReadParam(m, iter, &p->children);
+  ret = ret && ReadParam(m, iter, &p->html_attributes);
   return ret;
 }
 
@@ -835,6 +837,8 @@ void ParamTraits<webkit_glue::WebAccessibility>::Log(const param_type& p,
   LogParam(p.attributes, l);
   l->append(", ");
   LogParam(p.children, l);
+  l->append(", ");
+  LogParam(p.html_attributes, l);
   l->append(")");
 }
 
diff --git a/chrome/common/render_messages_unittest.cc b/chrome/common/render_messages_unittest.cc
index 4fc0aab..d45d5df 100644
--- a/chrome/common/render_messages_unittest.cc
+++ b/chrome/common/render_messages_unittest.cc
@@ -23,6 +23,10 @@ TEST(RenderMessagesUnittest, WebAccessibility) {
       (1 << webkit_glue::WebAccessibility::STATE_CHECKED) |
       (1 << webkit_glue::WebAccessibility::STATE_FOCUSED);
   input.location = WebKit::WebRect(11, 22, 333, 444);
+  input.html_attributes.push_back(
+      std::pair<string16, string16>(ASCIIToUTF16("id"), ASCIIToUTF16("a")));
+  input.html_attributes.push_back(
+      std::pair<string16, string16>(ASCIIToUTF16("class"), ASCIIToUTF16("b")));
 
   IPC::Message msg(1, 2, IPC::Message::PRIORITY_NORMAL);
   IPC::WriteParam(&msg, input);
@@ -39,6 +43,15 @@ TEST(RenderMessagesUnittest, WebAccessibility) {
   EXPECT_EQ(input.state, output.state);
   EXPECT_EQ(input.location, output.location);
   EXPECT_EQ(input.children.size(), output.children.size());
+  EXPECT_EQ(input.html_attributes.size(), output.html_attributes.size());
+  EXPECT_EQ(input.html_attributes[0].first,
+            output.html_attributes[0].first);
+  EXPECT_EQ(input.html_attributes[0].second,
+            output.html_attributes[0].second);
+  EXPECT_EQ(input.html_attributes[1].first,
+            output.html_attributes[1].first);
+  EXPECT_EQ(input.html_attributes[1].second,
+            output.html_attributes[1].second);
 
   // Test a corrupt case.
   IPC::Message bad_msg(1, 2, IPC::Message::PRIORITY_NORMAL);