Native Android accessibility.

content/browser/accessibility/browser_accessibility_manager.cc

 // Copyright (c) 2012 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.h"
 
 #include "base/logging.h"
 #include "content/browser/accessibility/browser_accessibility.h"
 #include "content/browser/accessibility/browser_accessibility_state_impl.h"
 #include "content/common/accessibility_messages.h"
 
 namespace content {
 
 BrowserAccessibility* BrowserAccessibilityFactory::Create() {
   return BrowserAccessibility::Create();
 }
 
 #if !defined(OS_MACOSX) && \
     !defined(OS_WIN) && \
-    !defined(TOOLKIT_GTK)
+    !defined(TOOLKIT_GTK) && \
+    !defined(OS_ANDROID) \
 // We have subclassess of BrowserAccessibilityManager on Mac, Linux/GTK,
 // and Win. For any other platform, instantiate the base class.
 // static
 BrowserAccessibilityManager* BrowserAccessibilityManager::Create(
     const AccessibilityNodeData& src,
     BrowserAccessibilityDelegate* delegate,
     BrowserAccessibilityFactory* factory) {
   return new BrowserAccessibilityManager(src, delegate, factory);
 }
 #endif
@@ skipping 53 matching lines @@
 }
 
 bool BrowserAccessibilityManager::IsOSKAllowed(const gfx::Rect& bounds) {
   if (!delegate_ || !delegate_->HasFocus())
     return false;
 
   gfx::Point touch_point = delegate_->GetLastTouchEventLocation();
   return bounds.Contains(touch_point);
 }
 
+bool BrowserAccessibilityManager::UseRootScrollOffsetsWhenComputingBounds() {
+  return true;
+}
+
 void BrowserAccessibilityManager::RemoveNode(BrowserAccessibility* node) {
   if (node == focus_)
     SetFocus(root_, false);
   int renderer_id = node->renderer_id();
   renderer_id_map_.erase(renderer_id);
 }
 
 void BrowserAccessibilityManager::OnAccessibilityNotifications(
     const std::vector<AccessibilityHostMsg_NotificationParams>& params) {
   for (uint32 index = 0; index < params.size(); index++) {
@@ skipping 47 matching lines @@
 
 void BrowserAccessibilityManager::SetFocus(
     BrowserAccessibility* node, bool notify) {
   if (focus_ != node)
     focus_ = node;
 
   if (notify && node && delegate_)
     delegate_->SetAccessibilityFocus(node->renderer_id());
 }
 
+void BrowserAccessibilityManager::SetRoot(BrowserAccessibility* node) {
+  root_ = node;
+  NotifyRootChanged();
+}
+
 void BrowserAccessibilityManager::DoDefaultAction(
     const BrowserAccessibility& node) {
   if (delegate_)
     delegate_->AccessibilityDoDefaultAction(node.renderer_id());
 }
 
 void BrowserAccessibilityManager::ScrollToMakeVisible(
     const BrowserAccessibility& node, gfx::Rect subfocus) {
   if (delegate_) {
     delegate_->AccessibilityScrollToMakeVisible(node.renderer_id(), subfocus);
@@ skipping 194 matching lines @@
 
   // Finally, swap in the new children vector for the old.
   instance->SwapChildren(new_children);
 
   // Handle the case where this node is the new root of the tree.
   if (src.role == AccessibilityNodeData::ROLE_ROOT_WEB_AREA &&
       (!root_ || root_->renderer_id() != src.id)) {
     if (root_)
       root_->Destroy();
     if (focus_ == root_)
-      focus_ = instance;
-    root_ = instance;
+      SetFocus(instance, false);
+    SetRoot(instance);
   }
 
   // Keep track of what node is focused.
-  if ((src.state >> AccessibilityNodeData::STATE_FOCUSED) & 1)
+  if (src.role != AccessibilityNodeData::ROLE_ROOT_WEB_AREA &&
+      src.role != AccessibilityNodeData::ROLE_WEB_AREA &&
+      (src.state >> AccessibilityNodeData::STATE_FOCUSED & 1)) {
     SetFocus(instance, false);
-
+  }
   return success;
 }
 
 }  // namespace content