| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <execinfo.h> | 5 #include <execinfo.h> |
| 6 | 6 |
| 7 #import "content/browser/accessibility/browser_accessibility_cocoa.h" | 7 #import "content/browser/accessibility/browser_accessibility_cocoa.h" |
| 8 | 8 |
| 9 #include <map> | 9 #include <map> |
| 10 | 10 |
| (...skipping 551 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 562 return nil; | 562 return nil; |
| 563 } | 563 } |
| 564 | 564 |
| 565 // Returns whether or not this node should be ignored in the | 565 // Returns whether or not this node should be ignored in the |
| 566 // accessibility tree. | 566 // accessibility tree. |
| 567 - (BOOL)isIgnored { | 567 - (BOOL)isIgnored { |
| 568 return [[self role] isEqualToString:NSAccessibilityUnknownRole]; | 568 return [[self role] isEqualToString:NSAccessibilityUnknownRole]; |
| 569 } | 569 } |
| 570 | 570 |
| 571 - (NSString*)invalid { | 571 - (NSString*)invalid { |
| 572 string16 invalidUTF; | 572 base::string16 invalidUTF; |
| 573 if (!browserAccessibility_->GetHtmlAttribute("aria-invalid", &invalidUTF)) | 573 if (!browserAccessibility_->GetHtmlAttribute("aria-invalid", &invalidUTF)) |
| 574 return NULL; | 574 return NULL; |
| 575 NSString* invalid = base::SysUTF16ToNSString(invalidUTF); | 575 NSString* invalid = base::SysUTF16ToNSString(invalidUTF); |
| 576 if ([invalid isEqualToString:@"false"] || | 576 if ([invalid isEqualToString:@"false"] || |
| 577 [invalid isEqualToString:@""]) { | 577 [invalid isEqualToString:@""]) { |
| 578 return @"false"; | 578 return @"false"; |
| 579 } | 579 } |
| 580 return invalid; | 580 return invalid; |
| 581 } | 581 } |
| 582 | 582 |
| (...skipping 706 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1289 nil]]; | 1289 nil]]; |
| 1290 } else if ([subrole isEqualToString:NSAccessibilityOutlineRowSubrole]) { | 1290 } else if ([subrole isEqualToString:NSAccessibilityOutlineRowSubrole]) { |
| 1291 [ret addObjectsFromArray:[NSArray arrayWithObjects: | 1291 [ret addObjectsFromArray:[NSArray arrayWithObjects: |
| 1292 NSAccessibilityDisclosingAttribute, | 1292 NSAccessibilityDisclosingAttribute, |
| 1293 NSAccessibilityDisclosedByRowAttribute, | 1293 NSAccessibilityDisclosedByRowAttribute, |
| 1294 NSAccessibilityDisclosureLevelAttribute, | 1294 NSAccessibilityDisclosureLevelAttribute, |
| 1295 NSAccessibilityDisclosedRowsAttribute, | 1295 NSAccessibilityDisclosedRowsAttribute, |
| 1296 nil]]; | 1296 nil]]; |
| 1297 } else if ([role isEqualToString:NSAccessibilityRowRole]) { | 1297 } else if ([role isEqualToString:NSAccessibilityRowRole]) { |
| 1298 if (browserAccessibility_->parent()) { | 1298 if (browserAccessibility_->parent()) { |
| 1299 string16 parentRole; | 1299 base::string16 parentRole; |
| 1300 browserAccessibility_->parent()->GetHtmlAttribute( | 1300 browserAccessibility_->parent()->GetHtmlAttribute( |
| 1301 "role", &parentRole); | 1301 "role", &parentRole); |
| 1302 const string16 treegridRole(ASCIIToUTF16("treegrid")); | 1302 const base::string16 treegridRole(ASCIIToUTF16("treegrid")); |
| 1303 if (parentRole == treegridRole) { | 1303 if (parentRole == treegridRole) { |
| 1304 [ret addObjectsFromArray:[NSArray arrayWithObjects: | 1304 [ret addObjectsFromArray:[NSArray arrayWithObjects: |
| 1305 NSAccessibilityDisclosingAttribute, | 1305 NSAccessibilityDisclosingAttribute, |
| 1306 NSAccessibilityDisclosedByRowAttribute, | 1306 NSAccessibilityDisclosedByRowAttribute, |
| 1307 NSAccessibilityDisclosureLevelAttribute, | 1307 NSAccessibilityDisclosureLevelAttribute, |
| 1308 NSAccessibilityDisclosedRowsAttribute, | 1308 NSAccessibilityDisclosedRowsAttribute, |
| 1309 nil]]; | 1309 nil]]; |
| 1310 } else { | 1310 } else { |
| 1311 [ret addObjectsFromArray:[NSArray arrayWithObjects: | 1311 [ret addObjectsFromArray:[NSArray arrayWithObjects: |
| 1312 NSAccessibilityIndexAttribute, | 1312 NSAccessibilityIndexAttribute, |
| (...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1475 return [super hash]; | 1475 return [super hash]; |
| 1476 return browserAccessibility_->renderer_id(); | 1476 return browserAccessibility_->renderer_id(); |
| 1477 } | 1477 } |
| 1478 | 1478 |
| 1479 - (BOOL)accessibilityShouldUseUniqueId { | 1479 - (BOOL)accessibilityShouldUseUniqueId { |
| 1480 return YES; | 1480 return YES; |
| 1481 } | 1481 } |
| 1482 | 1482 |
| 1483 @end | 1483 @end |
| 1484 | 1484 |
| OLD | NEW |