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

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 581 matching lines @@
   }
 
   return true;
 }
 
 void BrowserAccessibilityManagerAndroid::Click(JNIEnv* env,
                                                const JavaParamRef<jobject>& obj,
                                                jint id) {
   BrowserAccessibilityAndroid* node = GetFromUniqueID(id);
   if (node)
-    DoDefaultAction(*node);
+    node->manager()->DoDefaultAction(*node);
 }
 
 void BrowserAccessibilityManagerAndroid::Focus(JNIEnv* env,
                                                const JavaParamRef<jobject>& obj,
                                                jint id) {
   BrowserAccessibilityAndroid* node = GetFromUniqueID(id);
   if (node)
-    SetFocus(*node);
+    node->manager()->SetFocus(*node);
 }
 
 void BrowserAccessibilityManagerAndroid::Blur(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
   SetFocus(*GetRoot());
 }
 
 void BrowserAccessibilityManagerAndroid::ScrollToMakeNodeVisible(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jint id) {
   BrowserAccessibilityAndroid* node = GetFromUniqueID(id);
-  if (node)
-    ScrollToMakeVisible(*node, gfx::Rect(node->GetLocation().size()));
+  if (node) {
+    node->manager()->ScrollToMakeVisible(
+        *node, gfx::Rect(node->GetLocation().size()));
+  }
 }
 
 void BrowserAccessibilityManagerAndroid::SetTextFieldValue(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jint id,
     const JavaParamRef<jstring>& value) {
   BrowserAccessibilityAndroid* node = GetFromUniqueID(id);
   if (node) {
-    BrowserAccessibilityManager::SetValue(
+    node->manager()->SetValue(
         *node, base::android::ConvertJavaStringToUTF16(env, value));
   }
 }
 
 void BrowserAccessibilityManagerAndroid::SetSelection(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jint id,
     jint start,
     jint end) {
   BrowserAccessibilityAndroid* node = GetFromUniqueID(id);
   if (node)
-    SetTextSelection(*node, start, end);
+    node->manager()->SetTextSelection(*node, start, end);
 }
 
 jboolean BrowserAccessibilityManagerAndroid::AdjustSlider(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jint id,
     jboolean increment) {
   BrowserAccessibilityAndroid* node = GetFromUniqueID(id);
   if (!node)
     return false;
@@ skipping 10 matching lines @@
   if (max <= min)
     return false;
 
   // To behave similarly to an Android SeekBar, move by an increment of
   // approximately 20%.
   float original_value = value;
   float delta = (max - min) / 5.0f;
   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;
   }
   return false;
 }
 
 void BrowserAccessibilityManagerAndroid::HandleHoverEvent(
     BrowserAccessibility* node) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = GetJavaRefFromRootManager();
@@ skipping 191 matching lines @@
       NOTREACHED();
   }
 
   return true;
 }
 
 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(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jint id) {
   BrowserAccessibilityAndroid* node = GetFromUniqueID(id);
   if (!node)
     return false;
 
@@ skipping 51 matching lines @@
 
   JNIEnv* env = AttachCurrentThread();
   return root_manager->java_ref().get(env);
 }
 
 bool RegisterBrowserAccessibilityManager(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content