Added cursor navigation support for standard text fields and changed selection notifications so tha…

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 <stddef.h>
 
 #include "base/logging.h"
 #include "build/build_config.h"
@@ skipping 456 matching lines @@
   }
 }
 
 gfx::Rect BrowserAccessibilityManager::GetViewBounds() {
   BrowserAccessibilityDelegate* delegate = GetDelegateFromRootManager();
   if (delegate)
     return delegate->AccessibilityGetViewBounds();
   return gfx::Rect();
 }
 
-// Static
+// static
 BrowserAccessibility* BrowserAccessibilityManager::NextInTreeOrder(
     const BrowserAccessibility* object) {
   if (!object)
     return nullptr;
 
   if (object->PlatformChildCount())
     return object->PlatformGetChild(0);
 
   while (object) {
     BrowserAccessibility* sibling = object->GetNextSibling();
     if (sibling)
       return sibling;
 
     object = object->GetParent();
   }
 
   return nullptr;
 }
 
-// Static
+// static
 BrowserAccessibility* BrowserAccessibilityManager::PreviousInTreeOrder(
     const BrowserAccessibility* object) {
   if (!object)
     return nullptr;
 
   BrowserAccessibility* sibling = object->GetPreviousSibling();
   if (!sibling)
     return object->GetParent();
 
   if (sibling->PlatformChildCount())
     return sibling->PlatformDeepestLastChild();
 
   return sibling;
 }
 
-// Static
+// static
 BrowserAccessibility* BrowserAccessibilityManager::PreviousTextOnlyObject(
     const BrowserAccessibility* object) {
   BrowserAccessibility* previous_object = PreviousInTreeOrder(object);
   while (previous_object && !previous_object->IsTextOnlyObject())
     previous_object = PreviousInTreeOrder(previous_object);
 
   return previous_object;
 }
 
-// Static
+// static
 BrowserAccessibility* BrowserAccessibilityManager::NextTextOnlyObject(
     const BrowserAccessibility* object) {
   BrowserAccessibility* next_object = NextInTreeOrder(object);
   while (next_object && !next_object->IsTextOnlyObject())
     next_object = NextInTreeOrder(next_object);
 
   return next_object;
 }
 
-// Static
+// static
 bool BrowserAccessibilityManager::FindIndicesInCommonParent(
     const BrowserAccessibility& object1,
     const BrowserAccessibility& object2,
     BrowserAccessibility** common_parent,
     int* child_index1,
     int* child_index2) {
   DCHECK(common_parent && child_index1 && child_index2);
   auto ancestor1 = const_cast<BrowserAccessibility*>(&object1);
   auto ancestor2 = const_cast<BrowserAccessibility*>(&object2);
   do {
@@ skipping 13 matching lines @@
 
   do {
     *child_index2 = ancestor2->GetIndexInParent();
     ancestor2 = ancestor2->GetParent();
   } while (ancestor1 != ancestor2);
 
   *common_parent = ancestor1;
   return true;
 }
 
-// Static
+// static
 base::string16 BrowserAccessibilityManager::GetTextForRange(
     const BrowserAccessibility& start_object,
     int start_offset,
     const BrowserAccessibility& end_object,
     int end_offset) {
   DCHECK_GE(start_offset, 0);
   DCHECK_GE(end_offset, 0);
 
+  if (&start_object == &end_object && start_object.IsSimpleTextControl()) {
+    if (start_offset > end_offset)
+      std::swap(start_offset, end_offset);
+
+    if (start_offset >= static_cast<int>(start_object.GetValue().length()) ||
+        end_offset > static_cast<int>(start_object.GetValue().length())) {
+      return base::string16();
+    }
+
+    return start_object.GetValue().substr(start_offset,
+                                          end_offset - start_offset);
+  }
+
   int child_index1 = -1;
   int child_index2 = -1;
   if (&start_object != &end_object) {
     BrowserAccessibility* common_parent;
     if (!FindIndicesInCommonParent(start_object, end_object, &common_parent,
                                    &child_index1, &child_index2)) {
       return base::string16();
     }
 
     DCHECK(common_parent);
@@ skipping 25 matching lines @@
   if (!start_text_object->IsTextOnlyObject())
     start_text_object = NextTextOnlyObject(start_text_object);
   if (!end_text_object->IsTextOnlyObject())
     end_text_object = PreviousTextOnlyObject(end_text_object);
 
   if (!start_text_object || !end_text_object)
     return base::string16();
 
   // Be a little permissive with the start and end offsets.
   if (start_text_object == end_text_object) {
+    if (start_offset > end_offset)
+      std::swap(start_offset, end_offset);
+
     if (start_offset <
             static_cast<int>(start_text_object->GetText().length()) &&
         end_offset <= static_cast<int>(end_text_object->GetText().length())) {
-      if (start_offset <= end_offset) {
-        return start_text_object->GetText().substr(start_offset,
-                                                   end_offset - start_offset);
-      } else {
-        return start_text_object->GetText().substr(end_offset,
-                                                   start_offset - end_offset);
-      }
+      return start_text_object->GetText().substr(start_offset,
+                                                 end_offset - start_offset);
     }
     return start_text_object->GetText();
   }
 
   base::string16 text;
   if (start_offset < static_cast<int>(start_text_object->GetText().length()))
     text += start_text_object->GetText().substr(start_offset);
   else
     text += start_text_object->GetText();
   start_text_object = NextTextOnlyObject(start_text_object);
@@ skipping 97 matching lines @@
       tree_->CreateTreeSource());
   ui::AXTreeSerializer<const ui::AXNode*,
                        ui::AXNodeData,
                        ui::AXTreeData> serializer(tree_source.get());
   ui::AXTreeUpdate update;
   serializer.SerializeChanges(tree_->root(), &update);
   return update;
 }
 
 }  // namespace content