Rewrite renderer accessibility to not use WebAccessibilityCache.

webkit/glue/webaccessibility.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/glue/webaccessibility.h"
 
 #include <set>
 
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityCache.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityObject.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityRole.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAttribute.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocumentType.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFormControlElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNamedNodeMap.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h"
 
 #ifndef NDEBUG
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityNotification.h"
 #endif
 
 using base::DoubleToString;
 using base::IntToString;
-using WebKit::WebAccessibilityCache;
 using WebKit::WebAccessibilityRole;
 using WebKit::WebAccessibilityObject;
 
 #ifndef NDEBUG
 using WebKit::WebAccessibilityNotification;
 #endif
 
 namespace {
 
 std::string IntVectorToString(const std::vector<int>& items) {
@@ skipping 276 matching lines @@
     state |= (1 << WebAccessibility::STATE_VERTICAL);
 
   if (o.isVisited())
     state |= (1 << WebAccessibility::STATE_VISITED);
 
   return state;
 }
 
 WebAccessibility::WebAccessibility()
     : id(-1),
-      role(ROLE_NONE),
+      role(ROLE_UNKNOWN),
       state(-1) {
 }
 
 WebAccessibility::WebAccessibility(const WebKit::WebAccessibilityObject& src,
-                                   WebKit::WebAccessibilityCache* cache,
                                    bool include_children) {
-  Init(src, cache, include_children);
+  Init(src, include_children);
 }
 
 WebAccessibility::~WebAccessibility() {
 }
 
 #ifndef NDEBUG
 std::string WebAccessibility::DebugString(bool recursive,
                                           int render_routing_id,
                                           int notification) {
   std::string result;
@@ skipping 122 matching lines @@
     case ROLE_MENU_ITEM: result += " MENU_ITEM"; break;
     case ROLE_MENU_LIST_OPTION: result += " MENU_LIST_OPTION"; break;
     case ROLE_MENU_LIST_POPUP: result += " MENU_LIST_POPUP"; break;
     case ROLE_NOTE: result += " NOTE"; break;
     case ROLE_OUTLINE: result += " OUTLINE"; break;
     case ROLE_POPUP_BUTTON: result += " POPUP_BUTTON"; break;
     case ROLE_PROGRESS_INDICATOR: result += " PROGRESS_INDICATOR"; break;
     case ROLE_RADIO_BUTTON: result += " RADIO_BUTTON"; break;
     case ROLE_RADIO_GROUP: result += " RADIO_GROUP"; break;
     case ROLE_REGION: result += " REGION"; break;
+    case ROLE_ROOT_WEB_AREA: result += " ROOT_WEB_AREA"; break;
     case ROLE_ROW: result += " ROW"; break;
     case ROLE_ROW_HEADER: result += " ROW_HEADER"; break;
     case ROLE_RULER: result += " RULER"; break;
     case ROLE_RULER_MARKER: result += " RULER_MARKER"; break;
     case ROLE_SCROLLAREA: result += " SCROLLAREA"; break;
     case ROLE_SCROLLBAR: result += " SCROLLBAR"; break;
     case ROLE_SHEET: result += " SHEET"; break;
     case ROLE_SLIDER: result += " SLIDER"; break;
     case ROLE_SLIDER_THUMB: result += " SLIDER_THUMB"; break;
     case ROLE_SPLITTER: result += " SPLITTER"; break;
@@ skipping 257 matching lines @@
     for (size_t i = 0; i < children.size(); ++i)
       result += children[i].DebugString(true, 0, 0);
     --indent;
   }
 
   return result;
 }
 #endif  // ifndef NDEBUG
 
 void WebAccessibility::Init(const WebKit::WebAccessibilityObject& src,
-                            WebKit::WebAccessibilityCache* cache,
                             bool include_children) {
   name = src.title();
   role = ConvertRole(src.roleValue());
   state = ConvertState(src);
   location = src.boundingBoxRect();
+  id = src.axID();
 
   if (src.valueDescription().length())
     value = src.valueDescription();
   else
     value = src.stringValue();
 
   if (src.accessKey().length())
     string_attributes[ATTR_ACCESS_KEY] = src.accessKey();
   if (src.actionVerb().length())
     string_attributes[ATTR_ACTION] = src.actionVerb();
@@ skipping 153 matching lines @@
     int row_count = src.rowCount();
     if (column_count > 0 && row_count > 0) {
       std::set<int> unique_cell_id_set;
       int_attributes[ATTR_TABLE_COLUMN_COUNT] = column_count;
       int_attributes[ATTR_TABLE_ROW_COUNT] = row_count;
       for (int i = 0; i < column_count * row_count; ++i) {
         WebAccessibilityObject cell = src.cellForColumnAndRow(
             i % column_count, i / column_count);
         int cell_id = -1;
         if (!cell.isNull()) {
-          cell_id = cache->addOrGetId(cell);
+          cell_id = cell.axID();
           if (unique_cell_id_set.find(cell_id) == unique_cell_id_set.end()) {
             unique_cell_id_set.insert(cell_id);
             unique_cell_ids.push_back(cell_id);
           }
         }
         cell_ids.push_back(cell_id);
       }
     }
   }
 
   if (role == WebAccessibility::ROLE_CELL ||
       role == WebAccessibility::ROLE_ROW_HEADER ||
       role == WebAccessibility::ROLE_COLUMN_HEADER) {
     int_attributes[ATTR_TABLE_CELL_COLUMN_INDEX] = src.cellColumnIndex();
     int_attributes[ATTR_TABLE_CELL_COLUMN_SPAN] = src.cellColumnSpan();
     int_attributes[ATTR_TABLE_CELL_ROW_INDEX] = src.cellRowIndex();
     int_attributes[ATTR_TABLE_CELL_ROW_SPAN] = src.cellRowSpan();
   }
 
-  // Add the source object to the cache and store its id.
-  id = cache->addOrGetId(src);
-
   if (include_children) {
     // Recursively create children.
     int child_count = src.childCount();
     std::set<int32> child_ids;
     for (int i = 0; i < child_count; ++i) {
       WebAccessibilityObject child = src.childAt(i);
-      int32 child_id = cache->addOrGetId(child);
+      int32 child_id = child.axID();
 
       // The child may be invalid due to issues in webkit accessibility code.
       // Don't add children that are invalid thus preventing a crash.
       // https://bugs.webkit.org/show_bug.cgi?id=44149
       // TODO(ctguil): We may want to remove this check as webkit stabilizes.
       if (!child.isValid())
         continue;
 
       // Children may duplicated in the webkit accessibility tree. Only add a
       // child once for the web accessibility tree.
       // https://bugs.webkit.org/show_bug.cgi?id=58930
       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
       // unignored parent. For child nodes that are actually parented to
       // somethinng else, store only the ID.
       //
       // As an exception, also add children of an iframe element.
       // https://bugs.webkit.org/show_bug.cgi?id=57066
       if (is_iframe || IsParentUnignoredOf(src, child)) {
-        children.push_back(WebAccessibility(child, cache, include_children));
+        children.push_back(WebAccessibility(child, include_children));
       } else {
         indirect_child_ids.push_back(child_id);
       }
     }
   }
 }
 
 bool WebAccessibility::IsParentUnignoredOf(
     const WebKit::WebAccessibilityObject& ancestor,
     const WebKit::WebAccessibilityObject& child) {
   WebKit::WebAccessibilityObject parent = child.parentObject();
   while (!parent.isNull() && parent.accessibilityIsIgnored())
     parent = parent.parentObject();
   return parent.equals(ancestor);
 }
 
 }  // namespace webkit_glue