Merge to M54: Android accessibility actions inside iframes not sent to right frame

content/browser/accessibility/browser_accessibility_manager_android.cc

Index: content/browser/accessibility/browser_accessibility_manager_android.cc
diff --git a/content/browser/accessibility/browser_accessibility_manager_android.cc b/content/browser/accessibility/browser_accessibility_manager_android.cc
index df7361110a178fe0e03c4bd458df4bbaeacbbb1d..1f6e3d67e8806837df9a1fd3b25cb18a9957cb11 100644
--- a/content/browser/accessibility/browser_accessibility_manager_android.cc
+++ b/content/browser/accessibility/browser_accessibility_manager_android.cc
@@ -591,7 +591,7 @@ void BrowserAccessibilityManagerAndroid::Click(JNIEnv* env,
                                                jint id) {
   BrowserAccessibilityAndroid* node = GetFromUniqueID(id);
   if (node)
-    DoDefaultAction(*node);
+    node->manager()->DoDefaultAction(*node);
 }
 
 void BrowserAccessibilityManagerAndroid::Focus(JNIEnv* env,
@@ -599,7 +599,7 @@ void BrowserAccessibilityManagerAndroid::Focus(JNIEnv* env,
                                                jint id) {
   BrowserAccessibilityAndroid* node = GetFromUniqueID(id);
   if (node)
-    SetFocus(*node);
+    node->manager()->SetFocus(*node);
 }
 
 void BrowserAccessibilityManagerAndroid::Blur(
@@ -614,7 +614,8 @@ void BrowserAccessibilityManagerAndroid::ScrollToMakeNodeVisible(
     jint id) {
   BrowserAccessibilityAndroid* node = GetFromUniqueID(id);
   if (node)
-    ScrollToMakeVisible(*node, gfx::Rect(node->GetFrameBoundsRect().size()));
+    node->manager()->ScrollToMakeVisible(
+        *node, gfx::Rect(node->GetFrameBoundsRect().size()));
 }
 
 void BrowserAccessibilityManagerAndroid::SetTextFieldValue(
@@ -624,7 +625,7 @@ void BrowserAccessibilityManagerAndroid::SetTextFieldValue(
     const JavaParamRef<jstring>& value) {
   BrowserAccessibilityAndroid* node = GetFromUniqueID(id);
   if (node) {
-    BrowserAccessibilityManager::SetValue(
+    node->manager()->SetValue(
         *node, base::android::ConvertJavaStringToUTF16(env, value));
   }
 }
@@ -637,7 +638,7 @@ void BrowserAccessibilityManagerAndroid::SetSelection(
     jint end) {
   BrowserAccessibilityAndroid* node = GetFromUniqueID(id);
   if (node)
-    SetTextSelection(*node, start, end);
+    node->manager()->SetTextSelection(*node, start, end);
 }
 
 jboolean BrowserAccessibilityManagerAndroid::AdjustSlider(
@@ -668,7 +669,7 @@ jboolean BrowserAccessibilityManagerAndroid::AdjustSlider(
   value += (increment ? delta : -delta);
   value = std::max(std::min(value, max), min);
   if (value != original_value) {
-    BrowserAccessibilityManager::SetValue(
+    node->manager()->SetValue(
         *node, base::UTF8ToUTF16(base::DoubleToString(value)));
     return true;
   }
@@ -877,8 +878,14 @@ void BrowserAccessibilityManagerAndroid::SetAccessibilityFocus(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jint id) {
-  if (delegate_)
-    delegate_->AccessibilitySetAccessibilityFocus(id);
+  BrowserAccessibilityAndroid* node = GetFromUniqueID(id);
+  if (!node)
+    return;
+
+  if (node->manager()->delegate()) {
+    node->manager()->delegate()->AccessibilitySetAccessibilityFocus(
+        node->GetId());
+  }
 }
 
 bool BrowserAccessibilityManagerAndroid::IsSlider(