Native Android accessibility.

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 <cmath>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "content/browser/accessibility/browser_accessibility_android.h"
 #include "content/common/accessibility_messages.h"
+#include "jni/BrowserAccessibilityManager_jni.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ScopedJavaLocalRef;
 
 namespace {
 
 // Restricts |val| to the range [min, max].
 int Clamp(int val, int min, int max) {
   return std::min(std::max(val, min), max);
 }
@@ skipping 18 matching lines @@
 
 BrowserAccessibilityManagerAndroid::BrowserAccessibilityManagerAndroid(
     ScopedJavaLocalRef<jobject> content_view_core,
     const AccessibilityNodeData& src,
     BrowserAccessibilityDelegate* delegate,
     BrowserAccessibilityFactory* factory)
     : BrowserAccessibilityManager(src, delegate, factory) {
   if (content_view_core.is_null())
     return;
 
-  // TODO(aboxhall): set up Java references
+  JNIEnv* env = AttachCurrentThread();
+  java_ref_ = JavaObjectWeakGlobalRef(
+      env, Java_BrowserAccessibilityManager_create(
+          env, reinterpret_cast<jint>(this), content_view_core.obj()).obj());
 }
 
 BrowserAccessibilityManagerAndroid::~BrowserAccessibilityManagerAndroid() {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
     return;
 
-  // TODO(aboxhall): tear down Java references
+  Java_BrowserAccessibilityManager_onNativeObjectDestroyed(env, obj.obj());
 }
 
 // static
 AccessibilityNodeData BrowserAccessibilityManagerAndroid::GetEmptyDocument() {
   AccessibilityNodeData empty_document;
   empty_document.id = 0;
   empty_document.role = AccessibilityNodeData::ROLE_ROOT_WEB_AREA;
   empty_document.state = 1 << AccessibilityNodeData::STATE_READONLY;
   return empty_document;
 }
 
 void BrowserAccessibilityManagerAndroid::NotifyAccessibilityEvent(
     int type,
     BrowserAccessibility* node) {
-  JNIEnv* env = base::android::AttachCurrentThread();
+  JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
     return;
 
-  // TODO(aboxhall): call into appropriate Java method for each type of
-  // notification
+  switch (type) {
+    case AccessibilityNotificationLoadComplete:

[bulach, 2013/06/19 10:26:53]

not quite clear where these enum is coming from, but its style is wrong :)
feel free to fix as a follow up, but it should be
ACCESSIBILITY_NOTIFICATION_LOAD_COMPLETE, etc..

[dmazzoni, 2013/06/19 19:54:41]

It's been around for a while and that used to be an allowed
style. I'll refactor it in a separate change.

+      Java_BrowserAccessibilityManager_handlePageLoaded(
+          env, obj.obj(), focus_->renderer_id());
+      break;
+    case AccessibilityNotificationFocusChanged:
+      Java_BrowserAccessibilityManager_handleFocusChanged(
+          env, obj.obj(), node->renderer_id());
+      break;
+    case AccessibilityNotificationCheckStateChanged:
+      Java_BrowserAccessibilityManager_handleCheckStateChanged(
+          env, obj.obj(), node->renderer_id());
+      break;
+    case AccessibilityNotificationScrolledToAnchor:
+      Java_BrowserAccessibilityManager_handleScrolledToAnchor(
+          env, obj.obj(), node->renderer_id());
+      break;
+    case AccessibilityNotificationAlert:
+      Java_BrowserAccessibilityManager_announceObjectShow(
+          env, obj.obj(), node->renderer_id(), JNI_TRUE);

[bulach, 2013/06/19 10:26:53]

nit: missing break, is it intentional? if it is, please comment why the
fallthrough is necessary.

[dmazzoni, 2013/06/19 19:54:41]

Thanks, this was a bug.

+    case AccessibilityNotificationObjectShow:
+      Java_BrowserAccessibilityManager_announceObjectShow(
+          env, obj.obj(), node->renderer_id(), JNI_FALSE);

[bulach, 2013/06/19 10:26:53]

ditto

[dmazzoni, 2013/06/19 19:54:41]

Done.

+    case AccessibilityNotificationSelectedTextChanged:
+      Java_BrowserAccessibilityManager_handleTextSelectionChanged(
+          env, obj.obj(), node->renderer_id());
+      break;
+    case AccessibilityNotificationChildrenChanged:
+    case AccessibilityNotificationTextChanged:
+    case AccessibilityNotificationValueChanged:
+      if (node->IsEditableText()) {
+        Java_BrowserAccessibilityManager_handleEditableTextChanged(
+            env, obj.obj(), node->renderer_id());
+      } else {
+        Java_BrowserAccessibilityManager_handleContentChanged(
+            env, obj.obj(), node->renderer_id());
+      }
+      break;
+    default:
+      break;

[bulach, 2013/06/19 10:26:53]

nit: NOTREACHED() ?

[dmazzoni, 2013/06/19 19:54:41]

I don't want this, but I added a comment.

+  }
 }
 
 jint BrowserAccessibilityManagerAndroid::GetRootId(JNIEnv* env, jobject obj) {
   return static_cast<jint>(root_->renderer_id());
 }
 
 jint BrowserAccessibilityManagerAndroid::HitTest(
     JNIEnv* env, jobject obj, jint x, jint y) {
   BrowserAccessibilityAndroid* result =
       static_cast<BrowserAccessibilityAndroid*>(
@@ skipping 66 matching lines @@
   int dy = std::abs(y - nearest_y);
   return dx * dx + dy * dy;
 }
 
 jint BrowserAccessibilityManagerAndroid::GetNativeNodeById(
     JNIEnv* env, jobject obj, jint id) {
   return reinterpret_cast<jint>(GetFromRendererID(id));
 }
 
 void BrowserAccessibilityManagerAndroid::NotifyRootChanged() {
-  // TODO(aboxhall): non-stub implementation
+  JNIEnv* env = AttachCurrentThread();
+  ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
+  if (obj.is_null())
+    return;
+
+  Java_BrowserAccessibilityManager_handleNavigate(env, obj.obj());
 }
 
 bool
 BrowserAccessibilityManagerAndroid::UseRootScrollOffsetsWhenComputingBounds() {
   // The Java layer handles the root scroll offset.
   return false;
 }
 
 bool RegisterBrowserAccessibilityManager(JNIEnv* env) {
-  // TODO(aboxhall): non-stub implementation
-  return false;
+  return RegisterNativesImpl(env);
 }
 
 }  // namespace content