Android Autofill Accessibility, Phase I

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 <stddef.h>
 
 #include <cmath>
 
@@ skipping 99 matching lines @@
   InitSearchKeyToPredicateMapIfNeeded();
   const auto& iter = g_search_key_to_predicate_map.Get().find(element_type);
   if (iter != g_search_key_to_predicate_map.Get().end())
     return iter->second;
 
   // If we don't recognize the selector, return any element that a
   // screen reader should navigate to.
   return AllInterestingNodesPredicate;
 }
 
+static int32_t potential_popup_unique_id_ = -1;
+static int32_t current_unique_id_ = -1;
+static BrowserAccessibility* popup_node_ = nullptr;
+static ui::AXNode* popup_node_ax_node_ = nullptr;
+
 }  // anonymous namespace
 
 namespace aria_strings {
   const char kAriaLivePolite[] = "polite";
   const char kAriaLiveAssertive[] = "assertive";
 }
 
 // static
 BrowserAccessibilityManager* BrowserAccessibilityManager::Create(
     const ui::AXTreeUpdate& initial_tree,
@@ skipping 190 matching lines @@
 }
 
 base::android::ScopedJavaLocalRef<jstring>
 BrowserAccessibilityManagerAndroid::GetSupportedHtmlElementTypes(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
   InitSearchKeyToPredicateMapIfNeeded();
   return base::android::ConvertUTF16ToJavaString(env, g_all_search_keys.Get());
 }
 
+void BrowserAccessibilityManagerAndroid::OnAutofillPopupDisplayed(
+    JNIEnv* env,
+    const JavaParamRef<jobject>& obj) {
+  if (popup_node_) {
+    LOG(INFO) << "BrowserAccessibilityManagerAndroid::OnAutofillPopupDisplayed "
+                 "popup_node_->unique_id()="
+              << popup_node_->unique_id();
+  } else {
+    popup_node_ = BrowserAccessibility::Create();

[dmazzoni, 2017/03/22 16:13:54]

Maybe this should be called popup_dialog_proxy_node or something like that?

[csashi, 2017/03/24 01:32:23]

Done.

+    popup_node_ax_node_ = new ui::AXNode(nullptr, -1, -1);
+    ui::AXNodeData ax_node_data;
+    ax_node_data.role = ui::AX_ROLE_MENU;
+    ax_node_data.SetName("Autofill");
+    ax_node_data.state = 0;
+    ax_node_data.state |= 1 << ui::AX_STATE_READ_ONLY;
+    ax_node_data.state |= 1 << ui::AX_STATE_FOCUSABLE;
+    ax_node_data.state |= 1 << ui::AX_STATE_SELECTABLE;
+    popup_node_ax_node_->SetData(ax_node_data);
+    popup_node_->Init(this, popup_node_ax_node_);
+  }
+  LOG(INFO) << "current_unique_id_=" << current_unique_id_
+            << ", popup_node_->unique_id()=" << popup_node_->unique_id();
+  potential_popup_unique_id_ = current_unique_id_;

[dmazzoni, 2017/03/22 16:13:54]

To clarify, is "potential popup" the node that's the "host" of the popup?

Maybe getting this from the current focused node would be more accurate.
We should confirm that it's the right type of node we expect, then give the
variable a name something like that. It's basically the focused element that
the autofill popup is showing for.

[csashi, 2017/03/24 01:32:23]

Done.

+}
+void BrowserAccessibilityManagerAndroid::OnAutofillPopupDismissed(
+    JNIEnv* env,
+    const JavaParamRef<jobject>& obj) {
+  if (potential_popup_unique_id_ != -1) {
+    LOG(INFO) << "Clearing potential_popup_unique_id_="
+              << potential_popup_unique_id_;
+    potential_popup_unique_id_ = -1;
+  }
+  if (popup_node_) {
+    popup_node_->Destroy();
+    delete popup_node_ax_node_;
+    popup_node_ = nullptr;
+  }
+}
 jint BrowserAccessibilityManagerAndroid::GetRootId(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
   if (GetRoot())
     return static_cast<jint>(GetRoot()->unique_id());
   else
     return -1;
 }
 
 jboolean BrowserAccessibilityManagerAndroid::IsNodeValid(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jint id) {
-  return GetFromUniqueID(id) != NULL;
+  return GetFromUniqueID(id) != NULL ||
+         (popup_node_ && id == popup_node_->unique_id());
 }
 
 void BrowserAccessibilityManagerAndroid::HitTest(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jint x,
     jint y) {
   BrowserAccessibilityManager::HitTest(gfx::Point(x, y));
 }
 
@@ skipping 157 matching lines @@
   return true;
 }
 
 jboolean BrowserAccessibilityManagerAndroid::PopulateAccessibilityEvent(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     const JavaParamRef<jobject>& event,
     jint id,
     jint event_type) {
   BrowserAccessibilityAndroid* node = GetFromUniqueID(id);
+  LOG(INFO)
+      << "BrowserAccessibilityManagerAndroid::PopulateAccessibilityEvent id="
+      << id << ", event_type=" << event_type
+      << ", node->unique_id()=" << (node ? node->unique_id() : -1)
+      << ", node->GetId()=" << (node ? node->GetId() : -1)
+      << ", node->node()->id()=" << (node ? node->node()->id() : -1);
   if (!node)
     return false;
 
   Java_BrowserAccessibilityManager_setAccessibilityEventBooleanAttributes(
       env, obj, event,
       node->IsChecked(),
       node->IsEnabled(),
       node->IsPassword(),
       node->IsScrollable());
   Java_BrowserAccessibilityManager_setAccessibilityEventClassName(
@@ skipping 69 matching lines @@
         node->RangeCurrentValue());
   }
 
   return true;
 }
 
 void BrowserAccessibilityManagerAndroid::Click(JNIEnv* env,
                                                const JavaParamRef<jobject>& obj,
                                                jint id) {
   BrowserAccessibilityAndroid* node = GetFromUniqueID(id);
+  LOG(INFO) << "BrowserAccessibilityManagerAndroid::Click id=" << id
+            << ", node->unique_id()=" << (node ? node->unique_id() : -1)
+            << ", node->GetId()=" << (node ? node->GetId() : -1)
+            << ", node->node()->id()=" << (node ? node->node()->id() : -1);
   if (node)
     node->manager()->DoDefaultAction(*node);
 }
 
 void BrowserAccessibilityManagerAndroid::Focus(JNIEnv* env,
                                                const JavaParamRef<jobject>& obj,
                                                jint id) {
   BrowserAccessibilityAndroid* node = GetFromUniqueID(id);
   if (node)
     node->manager()->SetFocus(*node);
@@ skipping 116 matching lines @@
         env, obj, android_node->unique_id());
   }
 }
 
 jint BrowserAccessibilityManagerAndroid::FindElementType(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jint start_id,
     const JavaParamRef<jstring>& element_type_str,
     jboolean forwards) {
+  if (start_id == potential_popup_unique_id_) {
+    LOG(INFO) << "FindElementType start_id=" << start_id
+              << ", popup_node_->unique_id()=" << popup_node_->unique_id();
+    return popup_node_->unique_id();
+  }
+  if (popup_node_ && start_id == popup_node_->unique_id()) {
+    LOG(INFO) << "FindElementType start_id=" << start_id
+              << ", popup_node_->unique_id()=" << popup_node_->unique_id()
+              << ", potential_popup_unique_id_ = "
+              << potential_popup_unique_id_;
+    start_id = potential_popup_unique_id_;
+  }
   BrowserAccessibilityAndroid* start_node = GetFromUniqueID(start_id);
   if (!start_node)
     return 0;
 
   BrowserAccessibilityManager* root_manager = GetRootManager();
   if (!root_manager)
     return 0;
 
   BrowserAccessibility* root = root_manager->GetRoot();
   if (!root)
     return 0;
 
   AccessibilityMatchPredicate predicate = PredicateForSearchKey(
       base::android::ConvertJavaStringToUTF16(env, element_type_str));
 
   OneShotAccessibilityTreeSearch tree_search(root);
   tree_search.SetStartNode(start_node);
   tree_search.SetDirection(
       forwards ?
           OneShotAccessibilityTreeSearch::FORWARDS :
           OneShotAccessibilityTreeSearch::BACKWARDS);
   tree_search.SetResultLimit(1);
   tree_search.SetImmediateDescendantsOnly(false);
   tree_search.SetVisibleOnly(false);
   tree_search.AddPredicate(predicate);
 
   if (tree_search.CountMatches() == 0)
     return 0;
 
-  return tree_search.GetMatchAtIndex(0)->unique_id();
+  jint return_id = tree_search.GetMatchAtIndex(0)->unique_id();
+  current_unique_id_ = return_id;
+  return return_id;
 }
 
 jboolean BrowserAccessibilityManagerAndroid::NextAtGranularity(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jint granularity,
     jboolean extend_selection,
     jint id,
     jint cursor_index) {
   BrowserAccessibilityAndroid* node = GetFromUniqueID(id);
@@ skipping 125 matching lines @@
   }
 
   return true;
 }
 
 void BrowserAccessibilityManagerAndroid::SetAccessibilityFocus(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jint id) {
   BrowserAccessibilityAndroid* node = GetFromUniqueID(id);
+  LOG(INFO) << "BrowserAccessibilityManagerAndroid::SetAccessibilityFocus id="
+            << id << ", node->unique_id()=" << (node ? node->unique_id() : -1)
+            << ", node->GetId()=" << (node ? node->GetId() : -1)
+            << ", node->node()->id()=" << (node ? node->node()->id() : -1);
   if (!node)
     return;
 
   node->manager()->SetAccessibilityFocus(*node);
 }
 
 bool BrowserAccessibilityManagerAndroid::IsSlider(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jint id) {
@@ skipping 55 matching lines @@
 
   JNIEnv* env = AttachCurrentThread();
   return root_manager->java_ref().get(env);
 }
 
 bool RegisterBrowserAccessibilityManager(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content