From 847af343455fca79c86ec35634565a6324bac8bf Mon Sep 17 00:00:00 2001 From: "ctguil@chromium.org" Date: Tue, 19 Apr 2011 06:49:20 +0000 Subject: Fix handling of a case where an AccessibilityObject is listed as a child multiple times. BUG=79726 TEST=browser_tests:RendererAccessibilityBrowserTest.CrossPlatformDuplicateChildrenAccessibility Review URL: http://codereview.chromium.org/6873063 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82076 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/glue/webaccessibility.cc | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'webkit/glue') diff --git a/webkit/glue/webaccessibility.cc b/webkit/glue/webaccessibility.cc index aef31e4..7992fe8 100644 --- a/webkit/glue/webaccessibility.cc +++ b/webkit/glue/webaccessibility.cc @@ -4,6 +4,8 @@ #include "webkit/glue/webaccessibility.h" +#include + #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" @@ -387,8 +389,10 @@ void WebAccessibility::Init(const WebKit::WebAccessibilityObject& src, if (include_children) { // Recursively create children. int child_count = src.childCount(); + std::set child_ids; for (int i = 0; i < child_count; i++) { WebAccessibilityObject child = src.childAt(i); + int32 child_id = cache->addOrGetId(child); // The child may be invalid due to issues in webkit accessibility code. // Don't add children that are invalid thus preventing a crash. @@ -397,6 +401,13 @@ void WebAccessibility::Init(const WebKit::WebAccessibilityObject& src, if (!child.isValid()) continue; + // Children may duplicated in the webkit accessibility tree. Only add a + // child once for the web accessibility tree. + // TODO(ctguil): File webkit bug to track this issue. + if (child_ids.find(child_id) != child_ids.end()) + continue; + child_ids.insert(child_id); + // Some nodes appear in the tree in more than one place: for example, // a cell in a table appears as a child of both a row and a column. // Only recursively add child nodes that have this node as its @@ -408,7 +419,7 @@ void WebAccessibility::Init(const WebKit::WebAccessibilityObject& src, if (is_iframe || IsParentUnignoredOf(src, child)) { children.push_back(WebAccessibility(child, cache, include_children)); } else { - indirect_child_ids.push_back(cache->addOrGetId(child)); + indirect_child_ids.push_back(child_id); } } } -- cgit v1.1