Fix Android accessibility for editable text fields

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 163 matching lines @@
   if (content_view_core.is_null())
     return;
 
   JNIEnv* env = AttachCurrentThread();
   java_ref_ = JavaObjectWeakGlobalRef(
       env, Java_BrowserAccessibilityManager_create(
           env, reinterpret_cast<intptr_t>(this),
           content_view_core.obj()).obj());
 }
 
+bool BrowserAccessibilityManagerAndroid::ShouldExposePasswordText() {
+  JNIEnv* env = AttachCurrentThread();
+  ScopedJavaLocalRef<jobject> obj = GetJavaRefFromRootManager();
+  if (obj.is_null())
+    return false;
+
+  return Java_BrowserAccessibilityManager_shouldExposePasswordText(
+      env, obj.obj());
+}
+
 void BrowserAccessibilityManagerAndroid::NotifyAccessibilityEvent(
     ui::AXEvent event_type,
     BrowserAccessibility* node) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = GetJavaRefFromRootManager();
   if (obj.is_null())
     return;
 
   BrowserAccessibilityAndroid* android_node =
       static_cast<BrowserAccessibilityAndroid*>(node);
@@ skipping 202 matching lines @@
       node->CanScrollLeft(),
       node->CanScrollRight(),
       node->IsClickable(),
       node->IsEditableText(),
       node->IsEnabled(),
       node->IsFocusable(),
       node->IsFocused());
   Java_BrowserAccessibilityManager_setAccessibilityNodeInfoClassName(
       env, obj, info,
       base::android::ConvertUTF8ToJavaString(env, node->GetClassName()).obj());
-  if (!node->IsPassword() ||
-      Java_BrowserAccessibilityManager_shouldExposePasswordText(env, obj)) {
-    Java_BrowserAccessibilityManager_setAccessibilityNodeInfoContentDescription(
-        env, obj, info,
-        base::android::ConvertUTF16ToJavaString(env, node->GetText()).obj(),
-        node->IsLink());
-  }
+  Java_BrowserAccessibilityManager_setAccessibilityNodeInfoText(
+      env, obj, info,
+      base::android::ConvertUTF16ToJavaString(env, node->GetText()).obj(),
+      node->IsLink(),
+      node->IsEditableText());
   base::string16 element_id;
   if (node->GetHtmlAttribute("id", &element_id)) {
     Java_BrowserAccessibilityManager_setAccessibilityNodeInfoViewIdResourceName(
         env, obj, info,
         base::android::ConvertUTF16ToJavaString(env, element_id).obj());
   }
 
   gfx::Rect absolute_rect = node->GetLocalBoundsRect();
   gfx::Rect parent_relative_rect = absolute_rect;
   if (node->GetParent()) {
@@ skipping 76 matching lines @@
       node->GetItemCount());
   Java_BrowserAccessibilityManager_setAccessibilityEventScrollAttributes(
       env, obj, event,
       node->GetScrollX(),
       node->GetScrollY(),
       node->GetMaxScrollX(),
       node->GetMaxScrollY());
 
   switch (event_type) {
     case ANDROID_ACCESSIBILITY_EVENT_TEXT_CHANGED: {
-      base::string16 before_text, text;
-      if (!node->IsPassword() ||
-          Java_BrowserAccessibilityManager_shouldExposePasswordText(env, obj)) {
-        before_text = node->GetTextChangeBeforeText();
-        text = node->GetText();
-      }
+      base::string16 before_text = node->GetTextChangeBeforeText();
+      base::string16 text = node->GetText();
       Java_BrowserAccessibilityManager_setAccessibilityEventTextChangedAttrs(
           env, obj, event,
           node->GetTextChangeFromIndex(),
           node->GetTextChangeAddedCount(),
           node->GetTextChangeRemovedCount(),
           base::android::ConvertUTF16ToJavaString(
               env, before_text).obj(),
           base::android::ConvertUTF16ToJavaString(env, text).obj());
       break;
     }
     case ANDROID_ACCESSIBILITY_EVENT_TEXT_SELECTION_CHANGED: {
-      base::string16 text;
-      if (!node->IsPassword() ||
-          Java_BrowserAccessibilityManager_shouldExposePasswordText(env, obj)) {
-        text = node->GetText();
-      }
+      base::string16 text = node->GetText();
       Java_BrowserAccessibilityManager_setAccessibilityEventSelectionAttrs(
           env, obj, event,
           node->GetSelectionStart(),
           node->GetSelectionEnd(),
           node->GetEditableTextLength(),
           base::android::ConvertUTF16ToJavaString(env, text).obj());
       break;
     }
     default:
       break;
@@ skipping 196 matching lines @@
     jint id,
     jint cursor_index) {
   BrowserAccessibilityAndroid* node = GetFromUniqueID(id);
   if (!node)
     return false;
 
   jint start_index = -1;
   int end_index = -1;
   if (NextAtGranularity(granularity, cursor_index, node,
                         &start_index, &end_index)) {
-    base::string16 text;
-    if (!node->IsPassword() ||
-        Java_BrowserAccessibilityManager_shouldExposePasswordText(env, obj)) {
-      text = node->GetText();
-    }
+    base::string16 text = node->GetText();
     Java_BrowserAccessibilityManager_finishGranularityMove(
         env, obj, base::android::ConvertUTF16ToJavaString(
             env, text).obj(),
         extend_selection, start_index, end_index, true);
     return true;
   }
   return false;
 }
 
 jboolean BrowserAccessibilityManagerAndroid::PreviousAtGranularity(
@@ skipping 181 matching lines @@
 
   JNIEnv* env = AttachCurrentThread();
   return root_manager->java_ref().get(env);
 }
 
 bool RegisterBrowserAccessibilityManager(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content