Rewrite renderer accessibility to not use WebAccessibilityCache.

webkit/glue/webaccessibility.h

 // 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.
 
 #ifndef WEBKIT_GLUE_WEBACCESSIBILITY_H_
 #define WEBKIT_GLUE_WEBACCESSIBILITY_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/string16.h"
 #include "ui/gfx/rect.h"
 
 namespace WebKit {
-class WebAccessibilityCache;
 class WebAccessibilityObject;
 }
 
 namespace webkit_glue {
 
 // A compact representation of the accessibility information for a
 // single web object, in a form that can be serialized and sent from
 // the renderer process to the browser process.
 struct WebAccessibility {
  public:
-  // An alphabetical enumeration of accessibility roles.
+  // An enumeration of accessibility roles.
   enum Role {
-    ROLE_NONE = 0,
+    ROLE_UNKNOWN = 0,
 
-    ROLE_UNKNOWN,
+    // Used by Chromium to distinguish between the root of the tree
+    // for this page, and a web area for a frame within this page.
+    ROLE_ROOT_WEB_AREA,
 
+    // These roles all directly correspond to WebKit accessibility roles,
+    // keep these alphabetical.
     ROLE_ALERT,
     ROLE_ALERT_DIALOG,
     ROLE_ANNOTATION,
     ROLE_APPLICATION,
     ROLE_ARTICLE,
     ROLE_BROWSER,
     ROLE_BUSY_INDICATOR,
     ROLE_BUTTON,
     ROLE_CELL,
     ROLE_CHECKBOX,
@@ skipping 189 matching lines @@
     ATTR_LIVE_BUSY,
 
     // ARIA readonly flag.
     ATTR_ARIA_READONLY,
   };
 
   // Empty constructor, for serialization.
   WebAccessibility();
 
   // Construct from a WebAccessibilityObject. Recursively creates child
-  // nodes as needed to complete the tree. Adds |src| to |cache| and
-  // stores its cache ID.
+  // nodes as needed to complete the tree.
   WebAccessibility(const WebKit::WebAccessibilityObject& src,
-                   WebKit::WebAccessibilityCache* cache,
                    bool include_children);
 
   ~WebAccessibility();
 
 #ifndef NDEBUG
   std::string DebugString(bool recursive,
                           int render_routing_id,
                           int notification_type);
 #endif
 
  private:
   // Initialize an already-created struct, same as the constructor above.
   void Init(const WebKit::WebAccessibilityObject& src,
-            WebKit::WebAccessibilityCache* cache,
             bool include_children);
 
   // Returns true if |ancestor| is the first unignored parent of |child|,
   // which means that when walking up the parent chain from |child|,
   // |ancestor| is the *first* ancestor that isn't marked as
   // accessibilityIsIgnored().
   bool IsParentUnignoredOf(const WebKit::WebAccessibilityObject& ancestor,
                            const WebKit::WebAccessibilityObject& child);
 
  public:
@@ skipping 20 matching lines @@
   std::vector<int32> cell_ids;
 
   // For a table, the unique cell ids in row-major order of their first
   // occurrence.
   std::vector<int32> unique_cell_ids;
 };
 
 }  // namespace webkit_glue
 
 #endif  // WEBKIT_GLUE_WEBACCESSIBILITY_H_