| Index: content/browser/accessibility/browser_accessibility_cocoa.mm
|
| diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/content/browser/accessibility/browser_accessibility_cocoa.mm
|
| index 6e4d9704b27b08b6ed04f25e4dddcb5411df0af1..a1685aee192d96b73f9b73c5c863d3175e4ebc5c 100644
|
| --- a/content/browser/accessibility/browser_accessibility_cocoa.mm
|
| +++ b/content/browser/accessibility/browser_accessibility_cocoa.mm
|
| @@ -661,9 +661,10 @@ NSString* const NSAccessibilityRequiredAttribute = @"AXRequired";
|
| if (!browserAccessibility_->IsTableLikeRole())
|
| return nil;
|
| int count = -1;
|
| - if (!browserAccessibility_->GetIntAttribute(
|
| - ui::AX_ATTR_ARIA_COL_COUNT, &count))
|
| + if (!browserAccessibility_->GetIntAttribute(ui::AX_ATTR_ARIA_COLUMN_COUNT,
|
| + &count)) {
|
| return nil;
|
| + }
|
| return [NSNumber numberWithInt:count];
|
| }
|
|
|
| @@ -672,8 +673,9 @@ NSString* const NSAccessibilityRequiredAttribute = @"AXRequired";
|
| return nil;
|
| int index = -1;
|
| if (!browserAccessibility_->GetIntAttribute(
|
| - ui::AX_ATTR_ARIA_COL_INDEX, &index))
|
| + ui::AX_ATTR_ARIA_CELL_COLUMN_INDEX, &index)) {
|
| return nil;
|
| + }
|
| return [NSNumber numberWithInt:index];
|
| }
|
|
|
| @@ -702,9 +704,10 @@ NSString* const NSAccessibilityRequiredAttribute = @"AXRequired";
|
| if (!browserAccessibility_->IsTableLikeRole())
|
| return nil;
|
| int count = -1;
|
| - if (!browserAccessibility_->GetIntAttribute(
|
| - ui::AX_ATTR_ARIA_ROW_COUNT, &count))
|
| + if (!browserAccessibility_->GetIntAttribute(ui::AX_ATTR_ARIA_ROW_COUNT,
|
| + &count)) {
|
| return nil;
|
| + }
|
| return [NSNumber numberWithInt:count];
|
| }
|
|
|
| @@ -712,9 +715,10 @@ NSString* const NSAccessibilityRequiredAttribute = @"AXRequired";
|
| if (!browserAccessibility_->IsCellOrTableHeaderRole())
|
| return nil;
|
| int index = -1;
|
| - if (!browserAccessibility_->GetIntAttribute(
|
| - ui::AX_ATTR_ARIA_ROW_INDEX, &index))
|
| + if (!browserAccessibility_->GetIntAttribute(ui::AX_ATTR_ARIA_CELL_ROW_INDEX,
|
| + &index)) {
|
| return nil;
|
| + }
|
| return [NSNumber numberWithInt:index];
|
| }
|
|
|
|
|