Chromium Code Reviews| 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 "webkit/glue/webaccessibility.h" | 5 #include "webkit/glue/webaccessibility.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 | 8 |
| 9 #include "base/string_number_conversions.h" | 9 #include "base/string_number_conversions.h" |
| 10 #include "base/string_util.h" | 10 #include "base/string_util.h" |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 110 case WebKit::WebAccessibilityRoleDocumentMath: | 110 case WebKit::WebAccessibilityRoleDocumentMath: |
| 111 return WebAccessibility::ROLE_MATH; | 111 return WebAccessibility::ROLE_MATH; |
| 112 case WebKit::WebAccessibilityRoleDocumentNote: | 112 case WebKit::WebAccessibilityRoleDocumentNote: |
| 113 return WebAccessibility::ROLE_NOTE; | 113 return WebAccessibility::ROLE_NOTE; |
| 114 case WebKit::WebAccessibilityRoleDocumentRegion: | 114 case WebKit::WebAccessibilityRoleDocumentRegion: |
| 115 return WebAccessibility::ROLE_REGION; | 115 return WebAccessibility::ROLE_REGION; |
| 116 case WebKit::WebAccessibilityRoleDrawer: | 116 case WebKit::WebAccessibilityRoleDrawer: |
| 117 return WebAccessibility::ROLE_DRAWER; | 117 return WebAccessibility::ROLE_DRAWER; |
| 118 case WebKit::WebAccessibilityRoleEditableText: | 118 case WebKit::WebAccessibilityRoleEditableText: |
| 119 return WebAccessibility::ROLE_EDITABLE_TEXT; | 119 return WebAccessibility::ROLE_EDITABLE_TEXT; |
| 120 case WebKit::WebAccessibilityRoleFooter: | |
| 121 return WebAccessibility::ROLE_FOOTER; | |
| 120 case WebKit::WebAccessibilityRoleGrid: | 122 case WebKit::WebAccessibilityRoleGrid: |
| 121 return WebAccessibility::ROLE_GRID; | 123 return WebAccessibility::ROLE_GRID; |
| 122 case WebKit::WebAccessibilityRoleGroup: | 124 case WebKit::WebAccessibilityRoleGroup: |
| 123 return WebAccessibility::ROLE_GROUP; | 125 return WebAccessibility::ROLE_GROUP; |
| 124 case WebKit::WebAccessibilityRoleGrowArea: | 126 case WebKit::WebAccessibilityRoleGrowArea: |
| 125 return WebAccessibility::ROLE_GROW_AREA; | 127 return WebAccessibility::ROLE_GROW_AREA; |
| 126 case WebKit::WebAccessibilityRoleHeading: | 128 case WebKit::WebAccessibilityRoleHeading: |
| 127 return WebAccessibility::ROLE_HEADING; | 129 return WebAccessibility::ROLE_HEADING; |
| 128 case WebKit::WebAccessibilityRoleHelpTag: | 130 case WebKit::WebAccessibilityRoleHelpTag: |
| 129 return WebAccessibility::ROLE_HELP_TAG; | 131 return WebAccessibility::ROLE_HELP_TAG; |
| (...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 428 case ROLE_COLUMN: result += " COLUMN"; break; | 430 case ROLE_COLUMN: result += " COLUMN"; break; |
| 429 case ROLE_COLUMN_HEADER: result += " COLUMN_HEADER"; break; | 431 case ROLE_COLUMN_HEADER: result += " COLUMN_HEADER"; break; |
| 430 case ROLE_COMBO_BOX: result += " COMBO_BOX"; break; | 432 case ROLE_COMBO_BOX: result += " COMBO_BOX"; break; |
| 431 case ROLE_DEFINITION_LIST_DEFINITION: result += " DL_DEFINITION"; break; | 433 case ROLE_DEFINITION_LIST_DEFINITION: result += " DL_DEFINITION"; break; |
| 432 case ROLE_DEFINITION_LIST_TERM: result += " DL_TERM"; break; | 434 case ROLE_DEFINITION_LIST_TERM: result += " DL_TERM"; break; |
| 433 case ROLE_DIALOG: result += " DIALOG"; break; | 435 case ROLE_DIALOG: result += " DIALOG"; break; |
| 434 case ROLE_DIRECTORY: result += " DIRECTORY"; break; | 436 case ROLE_DIRECTORY: result += " DIRECTORY"; break; |
| 435 case ROLE_DISCLOSURE_TRIANGLE: result += " DISCLOSURE_TRIANGLE"; break; | 437 case ROLE_DISCLOSURE_TRIANGLE: result += " DISCLOSURE_TRIANGLE"; break; |
| 436 case ROLE_DOCUMENT: result += " DOCUMENT"; break; | 438 case ROLE_DOCUMENT: result += " DOCUMENT"; break; |
| 437 case ROLE_DRAWER: result += " DRAWER"; break; | 439 case ROLE_DRAWER: result += " DRAWER"; break; |
| 438 case ROLE_EDITABLE_TEXT: result += " EDITABLE_TEXT"; break; | 440 case ROLE_EDITABLE_TEXT: result += " EDITABLE_TEXT"; break; |
|
dmazzoni
2012/03/27 00:19:52
Add a debug string for ROLE_FOOTER here, please!
| |
| 439 case ROLE_GRID: result += " GRID"; break; | 441 case ROLE_GRID: result += " GRID"; break; |
| 440 case ROLE_GROUP: result += " GROUP"; break; | 442 case ROLE_GROUP: result += " GROUP"; break; |
| 441 case ROLE_GROW_AREA: result += " GROW_AREA"; break; | 443 case ROLE_GROW_AREA: result += " GROW_AREA"; break; |
| 442 case ROLE_HEADING: result += " HEADING"; break; | 444 case ROLE_HEADING: result += " HEADING"; break; |
| 443 case ROLE_HELP_TAG: result += " HELP_TAG"; break; | 445 case ROLE_HELP_TAG: result += " HELP_TAG"; break; |
| 444 case ROLE_IGNORED: result += " IGNORED"; break; | 446 case ROLE_IGNORED: result += " IGNORED"; break; |
| 445 case ROLE_IMAGE: result += " IMAGE"; break; | 447 case ROLE_IMAGE: result += " IMAGE"; break; |
| 446 case ROLE_IMAGE_MAP: result += " IMAGE_MAP"; break; | 448 case ROLE_IMAGE_MAP: result += " IMAGE_MAP"; break; |
| 447 case ROLE_IMAGE_MAP_LINK: result += " IMAGE_MAP_LINK"; break; | 449 case ROLE_IMAGE_MAP_LINK: result += " IMAGE_MAP_LINK"; break; |
| 448 case ROLE_INCREMENTOR: result += " INCREMENTOR"; break; | 450 case ROLE_INCREMENTOR: result += " INCREMENTOR"; break; |
| (...skipping 577 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1026 bool WebAccessibility::IsParentUnignoredOf( | 1028 bool WebAccessibility::IsParentUnignoredOf( |
| 1027 const WebKit::WebAccessibilityObject& ancestor, | 1029 const WebKit::WebAccessibilityObject& ancestor, |
| 1028 const WebKit::WebAccessibilityObject& child) { | 1030 const WebKit::WebAccessibilityObject& child) { |
| 1029 WebKit::WebAccessibilityObject parent = child.parentObject(); | 1031 WebKit::WebAccessibilityObject parent = child.parentObject(); |
| 1030 while (!parent.isNull() && parent.accessibilityIsIgnored()) | 1032 while (!parent.isNull() && parent.accessibilityIsIgnored()) |
| 1031 parent = parent.parentObject(); | 1033 parent = parent.parentObject(); |
| 1032 return parent.equals(ancestor); | 1034 return parent.equals(ancestor); |
| 1033 } | 1035 } |
| 1034 | 1036 |
| 1035 } // namespace webkit_glue | 1037 } // namespace webkit_glue |
| OLD | NEW |