Exposing ARIA state/property aria-orientation on Windows correctly.

content/browser/accessibility/browser_accessibility_cocoa.mm

 // 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 <execinfo.h>
 
 #import "content/browser/accessibility/browser_accessibility_cocoa.h"
 
 #include <map>
 
@@ skipping 428 matching lines @@
   return [NSNumber numberWithFloat:floatValue];
 }
 
 - (NSNumber*)minValue {
   float floatValue = browserAccessibility_->GetFloatAttribute(
       ui::AX_ATTR_MIN_VALUE_FOR_RANGE);
   return [NSNumber numberWithFloat:floatValue];
 }
 
 - (NSString*)orientation {
-  // We present a spin button as a vertical slider, with a role description
-  // of "spin button".
-  if ([self internalRole] == ui::AX_ROLE_SPIN_BUTTON)
-    return NSAccessibilityVerticalOrientationValue;
-
-  if ([self internalRole] == ui::AX_ROLE_LIST ||
-      [self internalRole] == ui::AX_ROLE_LIST_BOX) {
-    return NSAccessibilityVerticalOrientationValue;
-  }
-
   if (GetState(browserAccessibility_, ui::AX_STATE_VERTICAL))
     return NSAccessibilityVerticalOrientationValue;
-  else
+  else if (GetState(browserAccessibility_, ui::AX_STATE_HORIZONTAL))
     return NSAccessibilityHorizontalOrientationValue;
+
+  return @"";
 }
 
 - (NSNumber*)numberOfCharacters {
   return [NSNumber numberWithInt:browserAccessibility_->value().length()];
 }
 
 // The origin of this accessibility object in the page's document.
 // This is relative to webkit's top-left origin, not Cocoa's
 // bottom-left origin.
 - (NSPoint)origin {
@@ skipping 797 matching lines @@
         nil]];
   } else if ([role isEqualToString:NSAccessibilityTabGroupRole]) {
     [ret addObject:NSAccessibilityTabsAttribute];
   } else if ([role isEqualToString:NSAccessibilityProgressIndicatorRole] ||
              [role isEqualToString:NSAccessibilitySliderRole] ||
              [role isEqualToString:NSAccessibilityIncrementorRole] ||
              [role isEqualToString:NSAccessibilityScrollBarRole]) {
     [ret addObjectsFromArray:[NSArray arrayWithObjects:
         NSAccessibilityMaxValueAttribute,
         NSAccessibilityMinValueAttribute,
-        NSAccessibilityOrientationAttribute,
         NSAccessibilityValueDescriptionAttribute,
         nil]];
   } else if ([subrole isEqualToString:NSAccessibilityOutlineRowSubrole]) {
     [ret addObjectsFromArray:[NSArray arrayWithObjects:
         NSAccessibilityDisclosingAttribute,
         NSAccessibilityDisclosedByRowAttribute,
         NSAccessibilityDisclosureLevelAttribute,
         NSAccessibilityDisclosedRowsAttribute,
         nil]];
   } else if ([role isEqualToString:NSAccessibilityRowRole]) {
@@ skipping 10 matching lines @@
             NSAccessibilityDisclosedRowsAttribute,
             nil]];
       } else {
         [ret addObjectsFromArray:[NSArray arrayWithObjects:
             NSAccessibilityIndexAttribute,
             nil]];
       }
     }
   } else if ([role isEqualToString:NSAccessibilityListRole]) {
     [ret addObjectsFromArray:[NSArray arrayWithObjects:
-        NSAccessibilityOrientationAttribute,
         NSAccessibilitySelectedChildrenAttribute,
         NSAccessibilityVisibleChildrenAttribute,
         nil]];
   }
 
   // Add the url attribute only if it has a valid url.
   if ([self url] != nil) {
     [ret addObjectsFromArray:[NSArray arrayWithObjects:
         NSAccessibilityURLAttribute,
         nil]];
@@ skipping 26 matching lines @@
   }
 
   //Add expanded attribute only if it has expanded or collapsed state.
   if (GetState(browserAccessibility_, ui::AX_STATE_EXPANDED) ||
         GetState(browserAccessibility_, ui::AX_STATE_COLLAPSED)) {
     [ret addObjectsFromArray:[NSArray arrayWithObjects:
         NSAccessibilityExpandedAttribute,
         nil]];
   }
 
+  if (GetState(browserAccessibility_, ui::AX_STATE_VERTICAL)
+      || GetState(browserAccessibility_, ui::AX_STATE_HORIZONTAL)) {
+    [ret addObjectsFromArray:[NSArray arrayWithObjects:
+        NSAccessibilityOrientationAttribute, nil]];
+  }
+
   // Title UI Element.
   if (browserAccessibility_->HasIntAttribute(ui::AX_ATTR_TITLE_UI_ELEMENT) ||
       (browserAccessibility_->HasIntListAttribute(ui::AX_ATTR_LABELLEDBY_IDS) &&
        browserAccessibility_->GetIntListAttribute(ui::AX_ATTR_LABELLEDBY_IDS)
                             .size() == 1)) {
     [ret addObjectsFromArray:[NSArray arrayWithObjects:
          NSAccessibilityTitleUIElementAttribute,
          nil]];
   }
   // TODO(aboxhall): expose NSAccessibilityServesAsTitleForUIElementsAttribute
@@ skipping 142 matching lines @@
     return [super hash];
   return browserAccessibility_->GetId();
 }
 
 - (BOOL)accessibilityShouldUseUniqueId {
   return YES;
 }
 
 @end