MacViews: Make AXPlatformNodeCocoa consistent with NSAccessibilityConstants.h.

ui/accessibility/platform/ax_platform_node_mac.mm

 // Copyright 2014 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.
 
 #import "ui/accessibility/platform/ax_platform_node_mac.h"
 
 #import <Cocoa/Cocoa.h>
 #include <stddef.h>
 
 #include "base/macros.h"
@@ skipping 409 matching lines @@
   // specified in accessibilityIsAttributeSettable.
 }
 
 - (id)accessibilityAttributeValue:(NSString*)attribute {
   SEL selector = NSSelectorFromString(attribute);
   if ([self respondsToSelector:selector])
     return [self performSelector:selector];
   return nil;
 }
 
-// NSAccessibility attributes.
-
-- (NSArray*)AXChildren {
-  if (!node_)
-    return nil;
-  int count = node_->GetChildCount();
-  NSMutableArray* children = [NSMutableArray arrayWithCapacity:count];
-  for (int i = 0; i < count; ++i)
-    [children addObject:node_->ChildAtIndex(i)];
-  return NSAccessibilityUnignoredChildren(children);
-}
-
-- (id)AXParent {
-  if (!node_)
-    return nil;
-  return NSAccessibilityUnignoredAncestor(node_->GetParent());
-}
-
-- (NSValue*)AXPosition {
-  return [NSValue valueWithPoint:self.boundsInScreen.origin];
-}
+// NSAccessibility attributes. Order them according to
+// NSAccessibilityConstants.h, or see https://crbug.com/678898.
 
 - (NSString*)AXRole {
   if (!node_)
     return nil;
   return [[self class] nativeRoleFromAXRole:node_->GetData().role];
 }
 
+- (NSString*)AXRoleDescription {
+  return NSAccessibilityRoleDescription([self AXRole], [self AXSubrole]);
+}
+
 - (NSString*)AXSubrole {
   ui::AXRole role = node_->GetData().role;
   switch (role) {
     case ui::AX_ROLE_TEXT_FIELD:
       if (ui::AXNodeData::IsFlagSet(node_->GetData().state,
                                     ui::AX_STATE_PROTECTED))
         return NSAccessibilitySecureTextFieldSubrole;
       break;
     default:
       break;
   }
   return [AXPlatformNodeCocoa nativeSubroleFromAXRole:role];
 }
 
-- (NSString*)AXRoleDescription {
-  return NSAccessibilityRoleDescription([self AXRole], [self AXSubrole]);
-}
-
-- (NSValue*)AXSize {
-  return [NSValue valueWithSize:self.boundsInScreen.size];
-}
-
-- (NSString*)AXTitle {
-  return [self getStringAttribute:ui::AX_ATTR_NAME];
+- (NSString*)AXHelp {
+  return [self getStringAttribute:ui::AX_ATTR_DESCRIPTION];
 }
 
 - (NSString*)AXValue {
   return [self getStringAttribute:ui::AX_ATTR_VALUE];
 }
 
-- (NSValue*)AXEnabled {
+- (NSNumber*)AXEnabled {
   return [NSNumber
       numberWithBool:!ui::AXNodeData::IsFlagSet(node_->GetData().state,
                                                 ui::AX_STATE_DISABLED)];
 }
 
-- (NSValue*)AXFocused {
+- (NSNumber*)AXFocused {
   if (ui::AXNodeData::IsFlagSet(node_->GetData().state,
                                 ui::AX_STATE_FOCUSABLE))
     return [NSNumber numberWithBool:(node_->GetDelegate()->GetFocus() ==
                                      node_->GetNativeViewAccessible())];
   return [NSNumber numberWithBool:NO];
 }
 
-- (NSString*)AXHelp {
-  return [self getStringAttribute:ui::AX_ATTR_DESCRIPTION];
+- (id)AXParent {
+  if (!node_)
+    return nil;
+  return NSAccessibilityUnignoredAncestor(node_->GetParent());
 }
 
-- (NSWindow*)AXTopLevelUIElement {
+- (NSArray*)AXChildren {
+  if (!node_)
+    return nil;
+  int count = node_->GetChildCount();
+  NSMutableArray* children = [NSMutableArray arrayWithCapacity:count];
+  for (int i = 0; i < count; ++i)
+    [children addObject:node_->ChildAtIndex(i)];
+  return NSAccessibilityUnignoredChildren(children);
+}
+
+- (id)AXWindow {
+  return node_->GetDelegate()->GetTopLevelWidget();
+}
+
+- (id)AXTopLevelUIElement {
   return [self AXWindow];
 }
 
-- (NSWindow*)AXWindow {
-  return node_->GetDelegate()->GetTopLevelWidget();
+- (NSValue*)AXPosition {
+  return [NSValue valueWithPoint:self.boundsInScreen.origin];
 }
 
-// Textfield-specific NSAccessibility attributes.
-
-- (NSNumber*)AXInsertionPointLineNumber {
-  // Multiline is not supported on views.
-  return [NSNumber numberWithInteger:0];
+- (NSValue*)AXSize {
+  return [NSValue valueWithSize:self.boundsInScreen.size];
 }
 
-- (NSNumber*)AXNumberOfCharacters {
-  return [NSNumber numberWithInteger:[[self AXValue] length]];
+- (NSString*)AXTitle {
+  return [self getStringAttribute:ui::AX_ATTR_NAME];
 }
 
+// Misc attributes.
+
 - (NSString*)AXPlaceholderValue {
   return [self getStringAttribute:ui::AX_ATTR_PLACEHOLDER];
 }
 
+// Text-specific attributes.
+
 - (NSString*)AXSelectedText {
   NSRange selectedTextRange;
   [[self AXSelectedTextRange] getValue:&selectedTextRange];
   return [[self AXValue] substringWithRange:selectedTextRange];
 }
 
 - (NSValue*)AXSelectedTextRange {
   int textDir, start, end;
   node_->GetIntAttribute(ui::AX_ATTR_TEXT_DIRECTION, &textDir);
   node_->GetIntAttribute(ui::AX_ATTR_TEXT_SEL_START, &start);
   node_->GetIntAttribute(ui::AX_ATTR_TEXT_SEL_END, &end);
   // NSRange cannot represent the direction the text was selected in, so make
   // sure the correct selection index is used when creating a new range, taking
   // into account the textfield text direction as well.
   bool isReversed = (textDir == ui::AX_TEXT_DIRECTION_RTL) ||
                     (textDir == ui::AX_TEXT_DIRECTION_BTT);
   int beginSelectionIndex = (end > start && !isReversed) ? start : end;
   return [NSValue
       valueWithRange:NSMakeRange(beginSelectionIndex, abs(end - start))];
 }
 
+- (NSNumber*)AXNumberOfCharacters {
+  return [NSNumber numberWithInteger:[[self AXValue] length]];
+}
+
 - (NSValue*)AXVisibleCharacterRange {
   return [NSValue
       valueWithRange:NSMakeRange(0, [[self AXNumberOfCharacters] intValue])];
 }
 
+- (NSNumber*)AXInsertionPointLineNumber {
+  // Multiline is not supported on views.
+  return [NSNumber numberWithInteger:0];
+}
+
 @end
 
 namespace ui {
 
 // static
 AXPlatformNode* AXPlatformNode::Create(AXPlatformNodeDelegate* delegate) {
   AXPlatformNodeBase* node = new AXPlatformNodeMac();
   node->Init(delegate);
   return node;
 }
@@ skipping 33 matching lines @@
   }
   NotifyMacEvent(native_node_, event_type);
 }
 
 int AXPlatformNodeMac::GetIndexInParent() {
   // TODO(dmazzoni): implement this.  http://crbug.com/396137
   return -1;
 }
 
 }  // namespace ui