Refactor BrowserAccessibility to prepare for AXNode (re-land)

content/browser/accessibility/browser_accessibility_manager_android.cc

 // Copyright 2013 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 "content/browser/accessibility/browser_accessibility_manager_android.h"
 
 #include <cmath>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ skipping 110 matching lines @@
   if (obj.is_null())
     return;
 
   if (event_type == ui::AX_EVENT_HIDE)
     return;
 
   // Always send AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED to notify
   // the Android system that the accessibility hierarchy rooted at this
   // node has changed.
   Java_BrowserAccessibilityManager_handleContentChanged(
-      env, obj.obj(), node->renderer_id());
+      env, obj.obj(), node->GetId());
 
   switch (event_type) {
     case ui::AX_EVENT_LOAD_COMPLETE:
       Java_BrowserAccessibilityManager_handlePageLoaded(
-          env, obj.obj(), focus_->renderer_id());
+          env, obj.obj(), focus_->GetId());
       break;
     case ui::AX_EVENT_FOCUS:
       Java_BrowserAccessibilityManager_handleFocusChanged(
-          env, obj.obj(), node->renderer_id());
+          env, obj.obj(), node->GetId());
       break;
     case ui::AX_EVENT_CHECKED_STATE_CHANGED:
       Java_BrowserAccessibilityManager_handleCheckStateChanged(
-          env, obj.obj(), node->renderer_id());
+          env, obj.obj(), node->GetId());
       break;
     case ui::AX_EVENT_SCROLL_POSITION_CHANGED:
       Java_BrowserAccessibilityManager_handleScrollPositionChanged(
-          env, obj.obj(), node->renderer_id());
+          env, obj.obj(), node->GetId());
       break;
     case ui::AX_EVENT_SCROLLED_TO_ANCHOR:
       Java_BrowserAccessibilityManager_handleScrolledToAnchor(
-          env, obj.obj(), node->renderer_id());
+          env, obj.obj(), node->GetId());
       break;
     case ui::AX_EVENT_ALERT:
       // An alert is a special case of live region. Fall through to the
       // next case to handle it.
     case ui::AX_EVENT_SHOW: {
       // This event is fired when an object appears in a live region.
       // Speak its text.
       BrowserAccessibilityAndroid* android_node =
           static_cast<BrowserAccessibilityAndroid*>(node);
       Java_BrowserAccessibilityManager_announceLiveRegionText(
           env, obj.obj(),
           base::android::ConvertUTF16ToJavaString(
               env, android_node->GetText()).obj());
       break;
     }
     case ui::AX_EVENT_SELECTED_TEXT_CHANGED:
       Java_BrowserAccessibilityManager_handleTextSelectionChanged(
-          env, obj.obj(), node->renderer_id());
+          env, obj.obj(), node->GetId());
       break;
     case ui::AX_EVENT_CHILDREN_CHANGED:
     case ui::AX_EVENT_TEXT_CHANGED:
     case ui::AX_EVENT_VALUE_CHANGED:
       if (node->IsEditableText()) {
         Java_BrowserAccessibilityManager_handleEditableTextChanged(
-            env, obj.obj(), node->renderer_id());
+            env, obj.obj(), node->GetId());
       }
       break;
     default:
       // There are some notifications that aren't meaningful on Android.
       // It's okay to skip them.
       break;
   }
 }
 
 jint BrowserAccessibilityManagerAndroid::GetRootId(JNIEnv* env, jobject obj) {
-  return static_cast<jint>(root_->renderer_id());
+  return static_cast<jint>(root_->GetId());
 }
 
 jboolean BrowserAccessibilityManagerAndroid::IsNodeValid(
     JNIEnv* env, jobject obj, jint id) {
   return GetFromRendererID(id) != NULL;
 }
 
 jint BrowserAccessibilityManagerAndroid::HitTest(
     JNIEnv* env, jobject obj, jint x, jint y) {
   BrowserAccessibilityAndroid* result =
       static_cast<BrowserAccessibilityAndroid*>(
           root_->BrowserAccessibilityForPoint(gfx::Point(x, y)));
 
   if (!result)
-    return root_->renderer_id();
+    return root_->GetId();
 
   if (result->IsFocusable())
-    return result->renderer_id();
+    return result->GetId();
 
   // Examine the children of |result| to find the nearest accessibility focus
   // candidate
   BrowserAccessibility* nearest_node = FuzzyHitTest(x, y, result);
   if (nearest_node)
-    return nearest_node->renderer_id();
+    return nearest_node->GetId();
 
-  return root_->renderer_id();
+  return root_->GetId();
 }
 
 jboolean BrowserAccessibilityManagerAndroid::PopulateAccessibilityNodeInfo(
     JNIEnv* env, jobject obj, jobject info, jint id) {
   BrowserAccessibilityAndroid* node = static_cast<BrowserAccessibilityAndroid*>(
       GetFromRendererID(id));
   if (!node)
     return false;
 
-  if (node->parent()) {
+  if (node->GetParent()) {
     Java_BrowserAccessibilityManager_setAccessibilityNodeInfoParent(
-        env, obj, info, node->parent()->renderer_id());
+        env, obj, info, node->GetParent()->GetId());
   }
   for (unsigned i = 0; i < node->PlatformChildCount(); ++i) {
     Java_BrowserAccessibilityManager_addAccessibilityNodeInfoChild(
-        env, obj, info, node->children()[i]->renderer_id());
+        env, obj, info, node->InternalGetChild(i)->GetId());
   }
   Java_BrowserAccessibilityManager_setAccessibilityNodeInfoBooleanAttributes(
       env, obj, info,
       id,
       node->IsCheckable(),
       node->IsChecked(),
       node->IsClickable(),
       node->IsEnabled(),
       node->IsFocusable(),
       node->IsFocused(),
       node->IsPassword(),
       node->IsScrollable(),
       node->IsSelected(),
       node->IsVisibleToUser());
   Java_BrowserAccessibilityManager_setAccessibilityNodeInfoClassName(
       env, obj, info,
       base::android::ConvertUTF8ToJavaString(env, node->GetClassName()).obj());
   Java_BrowserAccessibilityManager_setAccessibilityNodeInfoContentDescription(
       env, obj, info,
       base::android::ConvertUTF16ToJavaString(env, node->GetText()).obj(),
       node->IsLink());
 
   gfx::Rect absolute_rect = node->GetLocalBoundsRect();
   gfx::Rect parent_relative_rect = absolute_rect;
-  if (node->parent()) {
-    gfx::Rect parent_rect = node->parent()->GetLocalBoundsRect();
+  if (node->GetParent()) {
+    gfx::Rect parent_rect = node->GetParent()->GetLocalBoundsRect();
     parent_relative_rect.Offset(-parent_rect.OffsetFromOrigin());
   }
-  bool is_root = node->parent() == NULL;
+  bool is_root = node->GetParent() == NULL;
   Java_BrowserAccessibilityManager_setAccessibilityNodeInfoLocation(
       env, obj, info,
       absolute_rect.x(), absolute_rect.y(),
       parent_relative_rect.x(), parent_relative_rect.y(),
       absolute_rect.width(), absolute_rect.height(),
       is_root);
 
   // New KitKat APIs
   Java_BrowserAccessibilityManager_setAccessibilityNodeInfoKitKatAttributes(
       env, obj, info,
@@ skipping 133 matching lines @@
 }
 
 void BrowserAccessibilityManagerAndroid::Blur(JNIEnv* env, jobject obj) {
   SetFocus(root_, true);
 }
 
 void BrowserAccessibilityManagerAndroid::ScrollToMakeNodeVisible(
     JNIEnv* env, jobject obj, jint id) {
   BrowserAccessibility* node = GetFromRendererID(id);
   if (node)
-    ScrollToMakeVisible(*node, gfx::Rect(node->location().size()));
+    ScrollToMakeVisible(*node, gfx::Rect(node->GetLocation().size()));
 }
 
 BrowserAccessibility* BrowserAccessibilityManagerAndroid::FuzzyHitTest(
     int x, int y, BrowserAccessibility* start_node) {
   BrowserAccessibility* nearest_node = NULL;
   int min_distance = INT_MAX;
   FuzzyHitTestImpl(x, y, start_node, &nearest_node, &min_distance);
   return nearest_node;
 }
 
@@ skipping 47 matching lines @@
   if (!node)
     return 0;
 
   AndroidHtmlElementType element_type = HtmlElementTypeFromString(
       base::android::ConvertJavaStringToUTF16(env, element_type_str));
 
   node = forwards ? NextInTreeOrder(node) : PreviousInTreeOrder(node);
   while (node) {
     switch(element_type) {
       case HTML_ELEMENT_TYPE_SECTION:
-        if (node->role() == ui::AX_ROLE_ARTICLE ||
-            node->role() == ui::AX_ROLE_APPLICATION ||
-            node->role() == ui::AX_ROLE_BANNER ||
-            node->role() == ui::AX_ROLE_COMPLEMENTARY ||
-            node->role() == ui::AX_ROLE_CONTENT_INFO ||
-            node->role() == ui::AX_ROLE_HEADING ||
-            node->role() == ui::AX_ROLE_MAIN ||
-            node->role() == ui::AX_ROLE_NAVIGATION ||
-            node->role() == ui::AX_ROLE_SEARCH ||
-            node->role() == ui::AX_ROLE_REGION) {
-          return node->renderer_id();
+        if (node->GetRole() == ui::AX_ROLE_ARTICLE ||
+            node->GetRole() == ui::AX_ROLE_APPLICATION ||
+            node->GetRole() == ui::AX_ROLE_BANNER ||
+            node->GetRole() == ui::AX_ROLE_COMPLEMENTARY ||
+            node->GetRole() == ui::AX_ROLE_CONTENT_INFO ||
+            node->GetRole() == ui::AX_ROLE_HEADING ||
+            node->GetRole() == ui::AX_ROLE_MAIN ||
+            node->GetRole() == ui::AX_ROLE_NAVIGATION ||
+            node->GetRole() == ui::AX_ROLE_SEARCH ||
+            node->GetRole() == ui::AX_ROLE_REGION) {
+          return node->GetId();
         }
         break;
       case HTML_ELEMENT_TYPE_LIST:
-        if (node->role() == ui::AX_ROLE_LIST ||
-            node->role() == ui::AX_ROLE_GRID ||
-            node->role() == ui::AX_ROLE_TABLE ||
-            node->role() == ui::AX_ROLE_TREE) {
-          return node->renderer_id();
+        if (node->GetRole() == ui::AX_ROLE_LIST ||
+            node->GetRole() == ui::AX_ROLE_GRID ||
+            node->GetRole() == ui::AX_ROLE_TABLE ||
+            node->GetRole() == ui::AX_ROLE_TREE) {
+          return node->GetId();
         }
         break;
       case HTML_ELEMENT_TYPE_CONTROL:
         if (static_cast<BrowserAccessibilityAndroid*>(node)->IsFocusable())
-          return node->renderer_id();
+          return node->GetId();
         break;
       case HTML_ELEMENT_TYPE_ANY:
         // In theory, the API says that an accessibility service could
         // jump to an element by element name, like 'H1' or 'P'. This isn't
         // currently used by any accessibility service, and we think it's
         // better to keep them high-level like 'SECTION' or 'CONTROL', so we
         // just fall back on linear navigation when we don't recognize the
         // element type.
         if (static_cast<BrowserAccessibilityAndroid*>(node)->IsClickable())
-          return node->renderer_id();
+          return node->GetId();
         break;
     }
 
     node = forwards ? NextInTreeOrder(node) : PreviousInTreeOrder(node);
   }
 
   return 0;
 }
 
 void BrowserAccessibilityManagerAndroid::NotifyRootChanged() {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
     return;
 
   Java_BrowserAccessibilityManager_handleNavigate(env, obj.obj());
 }
 
 bool
 BrowserAccessibilityManagerAndroid::UseRootScrollOffsetsWhenComputingBounds() {
   // The Java layer handles the root scroll offset.
   return false;
 }
 
 bool RegisterBrowserAccessibilityManager(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content