Support KitKat accessibility APIs.

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"
@@ skipping 210 matching lines @@
     parent_relative_rect.Offset(-parent_rect.OffsetFromOrigin());
   }
   bool is_root = node->parent() == NULL;
   Java_BrowserAccessibilityManager_setAccessibilityNodeInfoLocation(
       env, obj, info,
       absolute_rect.x(), absolute_rect.y(),
       parent_relative_rect.x(), parent_relative_rect.y(),
       absolute_rect.width(), absolute_rect.height(),
       is_root);
 
+  // New KitKat APIs
+  Java_BrowserAccessibilityManager_setAccessibilityNodeInfoKitKatAttributes(
+      env, obj, info,
+      node->CanOpenPopup(),
+      node->IsContentInvalid(),
+      node->IsDismissable(),
+      node->IsMultiLine(),
+      node->AndroidInputType(),
+      node->AndroidLiveRegionType());
+  if (node->IsCollection()) {
+    Java_BrowserAccessibilityManager_setAccessibilityNodeInfoCollectionInfo(
+        env, obj, info,
+        node->RowCount(),
+        node->ColumnCount(),
+        node->IsHierarchical());
+  }
+  if (node->IsCollectionItem() || node->IsHeading()) {
+    Java_BrowserAccessibilityManager_setAccessibilityNodeInfoCollectionItemInfo(
+        env, obj, info,
+        node->RowIndex(),
+        node->RowSpan(),
+        node->ColumnIndex(),
+        node->ColumnSpan(),
+        node->IsHeading());
+  }
+  if (node->IsRangeType()) {
+    Java_BrowserAccessibilityManager_setAccessibilityNodeInfoRangeInfo(
+        env, obj, info,
+        node->AndroidRangeType(),
+        node->RangeMin(),
+        node->RangeMax(),
+        node->RangeCurrentValue());
+  }
+
   return true;
 }
 
 jboolean BrowserAccessibilityManagerAndroid::PopulateAccessibilityEvent(
     JNIEnv* env, jobject obj, jobject event, jint id, jint event_type) {
   BrowserAccessibilityAndroid* node = static_cast<BrowserAccessibilityAndroid*>(
       GetFromRendererID(id));
   if (!node)
     return false;
 
@@ skipping 33 matching lines @@
           env, obj, event,
           node->GetSelectionStart(),
           node->GetSelectionEnd(),
           node->GetEditableTextLength(),
           base::android::ConvertUTF16ToJavaString(env, node->GetText()).obj());
       break;
     default:
       break;
   }
 
+  // Backwards-compatible fallback for new KitKat APIs.
+  Java_BrowserAccessibilityManager_setAccessibilityEventKitKatAttributes(
+      env, obj, event,
+      node->CanOpenPopup(),
+      node->IsContentInvalid(),
+      node->IsDismissable(),
+      node->IsMultiLine(),
+      node->AndroidInputType(),
+      node->AndroidLiveRegionType());
+  if (node->IsCollection()) {
+    Java_BrowserAccessibilityManager_setAccessibilityEventCollectionInfo(
+        env, obj, event,
+        node->RowCount(),
+        node->ColumnCount(),
+        node->IsHierarchical());
+  }
+  if (node->IsCollectionItem() || node->IsHeading()) {
+    Java_BrowserAccessibilityManager_setAccessibilityEventCollectionItemInfo(
+        env, obj, event,
+        node->RowIndex(),
+        node->RowSpan(),
+        node->ColumnIndex(),
+        node->ColumnSpan(),
+        node->IsHeading());
+  }
+  if (node->IsRangeType()) {
+    Java_BrowserAccessibilityManager_setAccessibilityEventRangeInfo(
+        env, obj, event,
+        node->AndroidRangeType(),
+        node->RangeMin(),
+        node->RangeMax(),
+        node->RangeCurrentValue());
+  }
+
   return true;
 }
 
 void BrowserAccessibilityManagerAndroid::Click(
     JNIEnv* env, jobject obj, jint id) {
   BrowserAccessibility* node = GetFromRendererID(id);
   if (node)
     DoDefaultAction(*node);
 }
 
@@ skipping 72 matching lines @@
 BrowserAccessibilityManagerAndroid::UseRootScrollOffsetsWhenComputingBounds() {
   // The Java layer handles the root scroll offset.
   return false;
 }
 
 bool RegisterBrowserAccessibilityManager(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content