From 81acd9115dc0c46bdf8615d300ecfa00c335806c Mon Sep 17 00:00:00 2001 From: "andybons@chromium.org" Date: Tue, 19 Apr 2011 09:23:41 +0000 Subject: Revert 82076 - Fix handling of a case where an AccessibilityObject is listed as a child multiple times.BUG=79726TEST=browser_tests:RendererAccessibilityBrowserTest.CrossPlatformDuplicateChildrenAccessibilityReview URL: http://codereview.chromium.org/6873063 TBR=ctguil@chromium.org Review URL: http://codereview.chromium.org/6880029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82085 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/glue/webaccessibility.cc | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'webkit/glue') diff --git a/webkit/glue/webaccessibility.cc b/webkit/glue/webaccessibility.cc index 7992fe8..aef31e4 100644 --- a/webkit/glue/webaccessibility.cc +++ b/webkit/glue/webaccessibility.cc @@ -4,8 +4,6 @@ #include "webkit/glue/webaccessibility.h" -#include - #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" @@ -389,10 +387,8 @@ 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. @@ -401,13 +397,6 @@ 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 @@ -419,7 +408,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(child_id); + indirect_child_ids.push_back(cache->addOrGetId(child)); } } } -- cgit v1.1