Fixes accessibility navigation out of autofill popup.

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 105 matching lines @@
     return iter->second;
 
   // If we don't recognize the selector, return any element that a
   // screen reader should navigate to.
   return AllInterestingNodesPredicate;
 }
 
 // The element in the document for which we may be displaying an autofill popup.
 int32_t g_element_hosting_autofill_popup_unique_id = -1;
 
+// The element in the document that is the next element after
+// |g_element_hosting_autofill_popup_unique_id|.
+int32_t g_element_after_element_hosting_autofill_popup_unique_id = -1;
+
 // Autofill popup will not be part of the |AXTree| that is sent by renderer.
 // Hence, we need a proxy |AXNode| to represent the autofill popup.
 BrowserAccessibility* g_autofill_popup_proxy_node = nullptr;
 ui::AXNode* g_autofill_popup_proxy_node_ax_node = nullptr;
 
 void DeleteAutofillPopupProxy() {
   if (g_autofill_popup_proxy_node) {
     g_autofill_popup_proxy_node->Destroy();
     delete g_autofill_popup_proxy_node_ax_node;
     g_autofill_popup_proxy_node = nullptr;
@@ skipping 622 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) {
-  // Navigate forwards to the autofill popup's proxy node if focus is currently
-  // on the element hosting the autofill popup. Once within the popup, a back
-  // press will navigate back to the element hosting the popup.
-  if (forwards && start_id == g_element_hosting_autofill_popup_unique_id &&
-      g_autofill_popup_proxy_node) {
-    return g_autofill_popup_proxy_node->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();
+  int32_t element_id = tree_search.GetMatchAtIndex(0)->unique_id();
+
+  // Navigate forwards to the autofill popup's proxy node if focus is currently
+  // on the element hosting the autofill popup. Once within the popup, a back
+  // press will navigate back to the element hosting the popup. If user swipes
+  // past last suggestion in the popup, or swipes left from the first suggestion
+  // in the popup, we will navigate to the element that is the next element in
+  // the document after the element hosting the popup.
+  if (forwards && start_id == g_element_hosting_autofill_popup_unique_id &&
+      g_autofill_popup_proxy_node) {
+    g_element_after_element_hosting_autofill_popup_unique_id = element_id;
+    return g_autofill_popup_proxy_node->unique_id();
+  }
+
+  return element_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 171 matching lines @@
   g_autofill_popup_proxy_node_ax_node->SetData(ax_node_data);
   g_autofill_popup_proxy_node->Init(this, g_autofill_popup_proxy_node_ax_node);
 
   g_element_hosting_autofill_popup_unique_id = current_focus->unique_id();
 }
 
 void BrowserAccessibilityManagerAndroid::OnAutofillPopupDismissed(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
   g_element_hosting_autofill_popup_unique_id = -1;
+  g_element_after_element_hosting_autofill_popup_unique_id = -1;
   DeleteAutofillPopupProxy();
 }
 
+jint BrowserAccessibilityManagerAndroid::
+    OnAutofillPopupAccessibilityFocusCleared(JNIEnv* env,
+                                             const JavaParamRef<jobject>& obj) {
+  if (!base::FeatureList::IsEnabled(features::kAndroidAutofillAccessibility) ||
+      g_element_after_element_hosting_autofill_popup_unique_id == -1)
+    return 0;
+  return g_element_after_element_hosting_autofill_popup_unique_id;

[dmazzoni, 2017/04/10 17:39:06]

It's possible that the user navigated away.

You should probably check to make sure that this node exists still,
and return 0 otherwise.

[csashi, 2017/04/10 18:06:28]

Done.

+}
+
 jboolean BrowserAccessibilityManagerAndroid::IsAutofillPopupNode(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jint id) {
   return g_autofill_popup_proxy_node &&
          g_autofill_popup_proxy_node->unique_id() == id;
 }
 
 bool BrowserAccessibilityManagerAndroid::Scroll(
     JNIEnv* env,
@@ skipping 46 matching lines @@
 
   JNIEnv* env = AttachCurrentThread();
   return root_manager->java_ref().get(env);
 }
 
 bool RegisterBrowserAccessibilityManager(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content