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 "content/browser/accessibility/browser_accessibility_win.h" | 5 #include "content/browser/accessibility/browser_accessibility_win.h" |
6 | 6 |
7 #include <UIAutomationClient.h> | 7 #include <UIAutomationClient.h> |
8 #include <UIAutomationCoreApi.h> | 8 #include <UIAutomationCoreApi.h> |
9 | 9 |
10 #include <algorithm> | 10 #include <algorithm> |
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
215 0x11cf, | 215 0x11cf, |
216 {0xb6, 0x61, 0x00, 0xaa, 0x00, 0x4c, 0xd6, 0xd8}}; | 216 {0xb6, 0x61, 0x00, 0xaa, 0x00, 0x4c, 0xd6, 0xd8}}; |
217 const GUID GUID_IAccessibleContentDocument = { | 217 const GUID GUID_IAccessibleContentDocument = { |
218 0xa5d8e1f3, | 218 0xa5d8e1f3, |
219 0x3571, | 219 0x3571, |
220 0x4d8f, | 220 0x4d8f, |
221 {0x95, 0x21, 0x07, 0xed, 0x28, 0xfb, 0x07, 0x2e}}; | 221 {0x95, 0x21, 0x07, 0xed, 0x28, 0xfb, 0x07, 0x2e}}; |
222 | 222 |
223 const base::char16 BrowserAccessibilityWin::kEmbeddedCharacter = L'\xfffc'; | 223 const base::char16 BrowserAccessibilityWin::kEmbeddedCharacter = L'\xfffc'; |
224 | 224 |
| 225 void AddAccessibilityModeFlags(AccessibilityMode mode_flags) { |
| 226 BrowserAccessibilityStateImpl::GetInstance()->AddAccessibilityModeFlags( |
| 227 mode_flags); |
| 228 } |
| 229 |
225 // | 230 // |
226 // BrowserAccessibilityRelation | 231 // BrowserAccessibilityRelation |
227 // | 232 // |
228 // A simple implementation of IAccessibleRelation, used to represent | 233 // A simple implementation of IAccessibleRelation, used to represent |
229 // a relationship between two accessible nodes in the tree. | 234 // a relationship between two accessible nodes in the tree. |
230 // | 235 // |
231 | 236 |
232 class BrowserAccessibilityRelation | 237 class BrowserAccessibilityRelation |
233 : public CComObjectRootEx<CComMultiThreadModel>, | 238 : public CComObjectRootEx<CComMultiThreadModel>, |
234 public IAccessibleRelation { | 239 public IAccessibleRelation { |
(...skipping 656 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
891 | 896 |
892 if (!role) | 897 if (!role) |
893 return E_INVALIDARG; | 898 return E_INVALIDARG; |
894 | 899 |
895 *role = ia2_role(); | 900 *role = ia2_role(); |
896 return S_OK; | 901 return S_OK; |
897 } | 902 } |
898 | 903 |
899 STDMETHODIMP BrowserAccessibilityWin::get_attributes(BSTR* attributes) { | 904 STDMETHODIMP BrowserAccessibilityWin::get_attributes(BSTR* attributes) { |
900 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_IA2_GET_ATTRIBUTES); | 905 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_IA2_GET_ATTRIBUTES); |
| 906 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
901 if (!attributes) | 907 if (!attributes) |
902 return E_INVALIDARG; | 908 return E_INVALIDARG; |
903 *attributes = nullptr; | 909 *attributes = nullptr; |
904 | 910 |
905 if (!instance_active()) | 911 if (!instance_active()) |
906 return E_FAIL; | 912 return E_FAIL; |
907 | 913 |
908 base::string16 str; | 914 base::string16 str; |
909 for (const base::string16& attribute : ia2_attributes()) | 915 for (const base::string16& attribute : ia2_attributes()) |
910 str += attribute + L';'; | 916 str += attribute + L';'; |
911 | 917 |
912 if (str.empty()) | 918 if (str.empty()) |
913 return S_FALSE; | 919 return S_FALSE; |
914 | 920 |
915 *attributes = SysAllocString(str.c_str()); | 921 *attributes = SysAllocString(str.c_str()); |
916 DCHECK(*attributes); | 922 DCHECK(*attributes); |
917 return S_OK; | 923 return S_OK; |
918 } | 924 } |
919 | 925 |
920 STDMETHODIMP BrowserAccessibilityWin::get_states(AccessibleStates* states) { | 926 STDMETHODIMP BrowserAccessibilityWin::get_states(AccessibleStates* states) { |
921 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_STATES); | 927 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_STATES); |
| 928 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
922 if (!instance_active()) | 929 if (!instance_active()) |
923 return E_FAIL; | 930 return E_FAIL; |
924 | 931 |
925 if (!states) | 932 if (!states) |
926 return E_INVALIDARG; | 933 return E_INVALIDARG; |
927 | 934 |
928 *states = ia2_state(); | 935 *states = ia2_state(); |
929 | 936 |
930 return S_OK; | 937 return S_OK; |
931 } | 938 } |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
965 | 972 |
966 if (!index_in_parent) | 973 if (!index_in_parent) |
967 return E_INVALIDARG; | 974 return E_INVALIDARG; |
968 | 975 |
969 *index_in_parent = this->GetIndexInParent(); | 976 *index_in_parent = this->GetIndexInParent(); |
970 return S_OK; | 977 return S_OK; |
971 } | 978 } |
972 | 979 |
973 STDMETHODIMP BrowserAccessibilityWin::get_nRelations(LONG* n_relations) { | 980 STDMETHODIMP BrowserAccessibilityWin::get_nRelations(LONG* n_relations) { |
974 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_N_RELATIONS); | 981 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_N_RELATIONS); |
| 982 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
975 if (!instance_active()) | 983 if (!instance_active()) |
976 return E_FAIL; | 984 return E_FAIL; |
977 | 985 |
978 if (!n_relations) | 986 if (!n_relations) |
979 return E_INVALIDARG; | 987 return E_INVALIDARG; |
980 | 988 |
981 *n_relations = relations_.size(); | 989 *n_relations = relations_.size(); |
982 return S_OK; | 990 return S_OK; |
983 } | 991 } |
984 | 992 |
985 STDMETHODIMP BrowserAccessibilityWin::get_relation( | 993 STDMETHODIMP BrowserAccessibilityWin::get_relation( |
986 LONG relation_index, | 994 LONG relation_index, |
987 IAccessibleRelation** relation) { | 995 IAccessibleRelation** relation) { |
988 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_RELATION); | 996 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_RELATION); |
| 997 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
989 if (!instance_active()) | 998 if (!instance_active()) |
990 return E_FAIL; | 999 return E_FAIL; |
991 | 1000 |
992 if (relation_index < 0 || | 1001 if (relation_index < 0 || |
993 relation_index >= static_cast<long>(relations_.size())) { | 1002 relation_index >= static_cast<long>(relations_.size())) { |
994 return E_INVALIDARG; | 1003 return E_INVALIDARG; |
995 } | 1004 } |
996 | 1005 |
997 if (!relation) | 1006 if (!relation) |
998 return E_INVALIDARG; | 1007 return E_INVALIDARG; |
999 | 1008 |
1000 relations_[relation_index]->AddRef(); | 1009 relations_[relation_index]->AddRef(); |
1001 *relation = relations_[relation_index]; | 1010 *relation = relations_[relation_index]; |
1002 return S_OK; | 1011 return S_OK; |
1003 } | 1012 } |
1004 | 1013 |
1005 STDMETHODIMP BrowserAccessibilityWin::get_relations( | 1014 STDMETHODIMP BrowserAccessibilityWin::get_relations( |
1006 LONG max_relations, | 1015 LONG max_relations, |
1007 IAccessibleRelation** relations, | 1016 IAccessibleRelation** relations, |
1008 LONG* n_relations) { | 1017 LONG* n_relations) { |
1009 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_RELATIONS); | 1018 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_RELATIONS); |
| 1019 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
1010 if (!instance_active()) | 1020 if (!instance_active()) |
1011 return E_FAIL; | 1021 return E_FAIL; |
1012 | 1022 |
1013 if (!relations || !n_relations) | 1023 if (!relations || !n_relations) |
1014 return E_INVALIDARG; | 1024 return E_INVALIDARG; |
1015 | 1025 |
1016 long count = static_cast<long>(relations_.size()); | 1026 long count = static_cast<long>(relations_.size()); |
1017 *n_relations = count; | 1027 *n_relations = count; |
1018 if (count == 0) | 1028 if (count == 0) |
1019 return S_FALSE; | 1029 return S_FALSE; |
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1089 manager()->ToBrowserAccessibilityManagerWin()->TrackScrollingObject(this); | 1099 manager()->ToBrowserAccessibilityManagerWin()->TrackScrollingObject(this); |
1090 | 1100 |
1091 return S_OK; | 1101 return S_OK; |
1092 } | 1102 } |
1093 | 1103 |
1094 STDMETHODIMP BrowserAccessibilityWin::get_groupPosition( | 1104 STDMETHODIMP BrowserAccessibilityWin::get_groupPosition( |
1095 LONG* group_level, | 1105 LONG* group_level, |
1096 LONG* similar_items_in_group, | 1106 LONG* similar_items_in_group, |
1097 LONG* position_in_group) { | 1107 LONG* position_in_group) { |
1098 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_GROUP_POSITION); | 1108 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_GROUP_POSITION); |
| 1109 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
1099 if (!instance_active()) | 1110 if (!instance_active()) |
1100 return E_FAIL; | 1111 return E_FAIL; |
1101 | 1112 |
1102 if (!group_level || !similar_items_in_group || !position_in_group) | 1113 if (!group_level || !similar_items_in_group || !position_in_group) |
1103 return E_INVALIDARG; | 1114 return E_INVALIDARG; |
1104 | 1115 |
1105 *group_level = GetIntAttribute(ui::AX_ATTR_HIERARCHICAL_LEVEL); | 1116 *group_level = GetIntAttribute(ui::AX_ATTR_HIERARCHICAL_LEVEL); |
1106 *similar_items_in_group = GetIntAttribute(ui::AX_ATTR_SET_SIZE); | 1117 *similar_items_in_group = GetIntAttribute(ui::AX_ATTR_SET_SIZE); |
1107 *position_in_group = GetIntAttribute(ui::AX_ATTR_POS_IN_SET); | 1118 *position_in_group = GetIntAttribute(ui::AX_ATTR_POS_IN_SET); |
1108 | 1119 |
1109 if (*group_level == *similar_items_in_group == *position_in_group == 0) | 1120 if (*group_level == *similar_items_in_group == *position_in_group == 0) |
1110 return S_FALSE; | 1121 return S_FALSE; |
1111 return S_OK; | 1122 return S_OK; |
1112 } | 1123 } |
1113 | 1124 |
1114 // | 1125 // |
1115 // IAccessibleEx methods not implemented. | 1126 // IAccessibleEx methods not implemented. |
1116 // | 1127 // |
1117 | 1128 |
1118 STDMETHODIMP BrowserAccessibilityWin::get_extendedRole(BSTR* extended_role) { | 1129 STDMETHODIMP BrowserAccessibilityWin::get_extendedRole(BSTR* extended_role) { |
1119 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_EXTENDED_ROLE); | 1130 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_EXTENDED_ROLE); |
| 1131 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
1120 return E_NOTIMPL; | 1132 return E_NOTIMPL; |
1121 } | 1133 } |
1122 STDMETHODIMP | 1134 STDMETHODIMP |
1123 BrowserAccessibilityWin::get_localizedExtendedRole( | 1135 BrowserAccessibilityWin::get_localizedExtendedRole( |
1124 BSTR* localized_extended_role) { | 1136 BSTR* localized_extended_role) { |
1125 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_LOCALIZED_EXTENDED_ROLE); | 1137 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_LOCALIZED_EXTENDED_ROLE); |
| 1138 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
1126 return E_NOTIMPL; | 1139 return E_NOTIMPL; |
1127 } | 1140 } |
1128 STDMETHODIMP | 1141 STDMETHODIMP |
1129 BrowserAccessibilityWin::get_nExtendedStates(LONG* n_extended_states) { | 1142 BrowserAccessibilityWin::get_nExtendedStates(LONG* n_extended_states) { |
1130 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_N_EXTENDED_STATES); | 1143 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_N_EXTENDED_STATES); |
| 1144 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
1131 return E_NOTIMPL; | 1145 return E_NOTIMPL; |
1132 } | 1146 } |
1133 STDMETHODIMP | 1147 STDMETHODIMP |
1134 BrowserAccessibilityWin::get_extendedStates(LONG max_extended_states, | 1148 BrowserAccessibilityWin::get_extendedStates(LONG max_extended_states, |
1135 BSTR** extended_states, | 1149 BSTR** extended_states, |
1136 LONG* n_extended_states) { | 1150 LONG* n_extended_states) { |
1137 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_EXTENDED_STATES); | 1151 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_EXTENDED_STATES); |
| 1152 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
1138 return E_NOTIMPL; | 1153 return E_NOTIMPL; |
1139 } | 1154 } |
1140 STDMETHODIMP | 1155 STDMETHODIMP |
1141 BrowserAccessibilityWin::get_localizedExtendedStates( | 1156 BrowserAccessibilityWin::get_localizedExtendedStates( |
1142 LONG max_localized_extended_states, | 1157 LONG max_localized_extended_states, |
1143 BSTR** localized_extended_states, | 1158 BSTR** localized_extended_states, |
1144 LONG* n_localized_extended_states) { | 1159 LONG* n_localized_extended_states) { |
1145 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_LOCALIZED_EXTENDED_STATES); | 1160 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_LOCALIZED_EXTENDED_STATES); |
| 1161 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
1146 return E_NOTIMPL; | 1162 return E_NOTIMPL; |
1147 } | 1163 } |
1148 STDMETHODIMP BrowserAccessibilityWin::get_locale(IA2Locale* locale) { | 1164 STDMETHODIMP BrowserAccessibilityWin::get_locale(IA2Locale* locale) { |
1149 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_LOCALE); | 1165 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_LOCALE); |
| 1166 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
1150 return E_NOTIMPL; | 1167 return E_NOTIMPL; |
1151 } | 1168 } |
1152 | 1169 |
1153 // | 1170 // |
1154 // IAccessibleApplication methods. | 1171 // IAccessibleApplication methods. |
1155 // | 1172 // |
1156 | 1173 |
1157 STDMETHODIMP BrowserAccessibilityWin::get_appName(BSTR* app_name) { | 1174 STDMETHODIMP BrowserAccessibilityWin::get_appName(BSTR* app_name) { |
1158 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_APP_NAME); | 1175 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_APP_NAME); |
1159 // No need to check |instance_active()| because this interface is | 1176 // No need to check |instance_active()| because this interface is |
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1292 | 1309 |
1293 // | 1310 // |
1294 // IAccessibleTable methods. | 1311 // IAccessibleTable methods. |
1295 // | 1312 // |
1296 | 1313 |
1297 STDMETHODIMP BrowserAccessibilityWin::get_accessibleAt( | 1314 STDMETHODIMP BrowserAccessibilityWin::get_accessibleAt( |
1298 long row, | 1315 long row, |
1299 long column, | 1316 long column, |
1300 IUnknown** accessible) { | 1317 IUnknown** accessible) { |
1301 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ACCESSIBLE_AT); | 1318 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ACCESSIBLE_AT); |
| 1319 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
1302 if (!instance_active()) | 1320 if (!instance_active()) |
1303 return E_FAIL; | 1321 return E_FAIL; |
1304 | 1322 |
1305 if (!accessible) | 1323 if (!accessible) |
1306 return E_INVALIDARG; | 1324 return E_INVALIDARG; |
1307 | 1325 |
1308 int columns; | 1326 int columns; |
1309 int rows; | 1327 int rows; |
1310 if (!GetIntAttribute( | 1328 if (!GetIntAttribute( |
1311 ui::AX_ATTR_TABLE_COLUMN_COUNT, &columns) || | 1329 ui::AX_ATTR_TABLE_COLUMN_COUNT, &columns) || |
(...skipping 17 matching lines...) Expand all Loading... |
1329 *accessible = static_cast<IAccessible*>(cell->NewReference()); | 1347 *accessible = static_cast<IAccessible*>(cell->NewReference()); |
1330 return S_OK; | 1348 return S_OK; |
1331 } | 1349 } |
1332 | 1350 |
1333 *accessible = NULL; | 1351 *accessible = NULL; |
1334 return E_INVALIDARG; | 1352 return E_INVALIDARG; |
1335 } | 1353 } |
1336 | 1354 |
1337 STDMETHODIMP BrowserAccessibilityWin::get_caption(IUnknown** accessible) { | 1355 STDMETHODIMP BrowserAccessibilityWin::get_caption(IUnknown** accessible) { |
1338 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_CAPTION); | 1356 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_CAPTION); |
| 1357 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
1339 if (!instance_active()) | 1358 if (!instance_active()) |
1340 return E_FAIL; | 1359 return E_FAIL; |
1341 | 1360 |
1342 if (!accessible) | 1361 if (!accessible) |
1343 return E_INVALIDARG; | 1362 return E_INVALIDARG; |
1344 | 1363 |
1345 // TODO(dmazzoni): implement | 1364 // TODO(dmazzoni): implement |
1346 return S_FALSE; | 1365 return S_FALSE; |
1347 } | 1366 } |
1348 | 1367 |
1349 STDMETHODIMP BrowserAccessibilityWin::get_childIndex(long row, | 1368 STDMETHODIMP BrowserAccessibilityWin::get_childIndex(long row, |
1350 long column, | 1369 long column, |
1351 long* cell_index) { | 1370 long* cell_index) { |
1352 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_CHILD_INDEX); | 1371 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_CHILD_INDEX); |
| 1372 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
1353 if (!instance_active()) | 1373 if (!instance_active()) |
1354 return E_FAIL; | 1374 return E_FAIL; |
1355 | 1375 |
1356 if (!cell_index) | 1376 if (!cell_index) |
1357 return E_INVALIDARG; | 1377 return E_INVALIDARG; |
1358 | 1378 |
1359 int columns; | 1379 int columns; |
1360 int rows; | 1380 int rows; |
1361 if (!GetIntAttribute( | 1381 if (!GetIntAttribute( |
1362 ui::AX_ATTR_TABLE_COLUMN_COUNT, &columns) || | 1382 ui::AX_ATTR_TABLE_COLUMN_COUNT, &columns) || |
(...skipping 19 matching lines...) Expand all Loading... |
1382 return S_OK; | 1402 return S_OK; |
1383 } | 1403 } |
1384 } | 1404 } |
1385 | 1405 |
1386 return S_FALSE; | 1406 return S_FALSE; |
1387 } | 1407 } |
1388 | 1408 |
1389 STDMETHODIMP BrowserAccessibilityWin::get_columnDescription(long column, | 1409 STDMETHODIMP BrowserAccessibilityWin::get_columnDescription(long column, |
1390 BSTR* description) { | 1410 BSTR* description) { |
1391 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_COLUMN_DESCRIPTION); | 1411 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_COLUMN_DESCRIPTION); |
| 1412 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
1392 if (!instance_active()) | 1413 if (!instance_active()) |
1393 return E_FAIL; | 1414 return E_FAIL; |
1394 | 1415 |
1395 if (!description) | 1416 if (!description) |
1396 return E_INVALIDARG; | 1417 return E_INVALIDARG; |
1397 | 1418 |
1398 int columns; | 1419 int columns; |
1399 int rows; | 1420 int rows; |
1400 if (!GetIntAttribute( | 1421 if (!GetIntAttribute( |
1401 ui::AX_ATTR_TABLE_COLUMN_COUNT, &columns) || | 1422 ui::AX_ATTR_TABLE_COLUMN_COUNT, &columns) || |
(...skipping 27 matching lines...) Expand all Loading... |
1429 } | 1450 } |
1430 | 1451 |
1431 return S_FALSE; | 1452 return S_FALSE; |
1432 } | 1453 } |
1433 | 1454 |
1434 STDMETHODIMP BrowserAccessibilityWin::get_columnExtentAt( | 1455 STDMETHODIMP BrowserAccessibilityWin::get_columnExtentAt( |
1435 long row, | 1456 long row, |
1436 long column, | 1457 long column, |
1437 long* n_columns_spanned) { | 1458 long* n_columns_spanned) { |
1438 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_COLUMN_EXTENT_AT); | 1459 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_COLUMN_EXTENT_AT); |
| 1460 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
1439 if (!instance_active()) | 1461 if (!instance_active()) |
1440 return E_FAIL; | 1462 return E_FAIL; |
1441 | 1463 |
1442 if (!n_columns_spanned) | 1464 if (!n_columns_spanned) |
1443 return E_INVALIDARG; | 1465 return E_INVALIDARG; |
1444 | 1466 |
1445 int columns; | 1467 int columns; |
1446 int rows; | 1468 int rows; |
1447 if (!GetIntAttribute( | 1469 if (!GetIntAttribute( |
1448 ui::AX_ATTR_TABLE_COLUMN_COUNT, &columns) || | 1470 ui::AX_ATTR_TABLE_COLUMN_COUNT, &columns) || |
(...skipping 19 matching lines...) Expand all Loading... |
1468 return S_OK; | 1490 return S_OK; |
1469 } | 1491 } |
1470 | 1492 |
1471 return S_FALSE; | 1493 return S_FALSE; |
1472 } | 1494 } |
1473 | 1495 |
1474 STDMETHODIMP BrowserAccessibilityWin::get_columnHeader( | 1496 STDMETHODIMP BrowserAccessibilityWin::get_columnHeader( |
1475 IAccessibleTable** accessible_table, | 1497 IAccessibleTable** accessible_table, |
1476 long* starting_row_index) { | 1498 long* starting_row_index) { |
1477 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_COLUMN_HEADER); | 1499 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_COLUMN_HEADER); |
| 1500 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
1478 // TODO(dmazzoni): implement | 1501 // TODO(dmazzoni): implement |
1479 return E_NOTIMPL; | 1502 return E_NOTIMPL; |
1480 } | 1503 } |
1481 | 1504 |
1482 STDMETHODIMP BrowserAccessibilityWin::get_columnIndex(long cell_index, | 1505 STDMETHODIMP BrowserAccessibilityWin::get_columnIndex(long cell_index, |
1483 long* column_index) { | 1506 long* column_index) { |
1484 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_COLUMN_INDEX); | 1507 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_COLUMN_INDEX); |
| 1508 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
1485 if (!instance_active()) | 1509 if (!instance_active()) |
1486 return E_FAIL; | 1510 return E_FAIL; |
1487 | 1511 |
1488 if (!column_index) | 1512 if (!column_index) |
1489 return E_INVALIDARG; | 1513 return E_INVALIDARG; |
1490 | 1514 |
1491 const std::vector<int32_t>& unique_cell_ids = | 1515 const std::vector<int32_t>& unique_cell_ids = |
1492 GetIntListAttribute(ui::AX_ATTR_UNIQUE_CELL_IDS); | 1516 GetIntListAttribute(ui::AX_ATTR_UNIQUE_CELL_IDS); |
1493 int cell_id_count = static_cast<int>(unique_cell_ids.size()); | 1517 int cell_id_count = static_cast<int>(unique_cell_ids.size()); |
1494 if (cell_index < 0) | 1518 if (cell_index < 0) |
1495 return E_INVALIDARG; | 1519 return E_INVALIDARG; |
1496 if (cell_index >= cell_id_count) | 1520 if (cell_index >= cell_id_count) |
1497 return S_FALSE; | 1521 return S_FALSE; |
1498 | 1522 |
1499 int cell_id = unique_cell_ids[cell_index]; | 1523 int cell_id = unique_cell_ids[cell_index]; |
1500 BrowserAccessibilityWin* cell = GetFromID(cell_id); | 1524 BrowserAccessibilityWin* cell = GetFromID(cell_id); |
1501 int col_index; | 1525 int col_index; |
1502 if (cell && | 1526 if (cell && |
1503 cell->GetIntAttribute( | 1527 cell->GetIntAttribute( |
1504 ui::AX_ATTR_TABLE_CELL_COLUMN_INDEX, &col_index)) { | 1528 ui::AX_ATTR_TABLE_CELL_COLUMN_INDEX, &col_index)) { |
1505 *column_index = col_index; | 1529 *column_index = col_index; |
1506 return S_OK; | 1530 return S_OK; |
1507 } | 1531 } |
1508 | 1532 |
1509 return S_FALSE; | 1533 return S_FALSE; |
1510 } | 1534 } |
1511 | 1535 |
1512 STDMETHODIMP BrowserAccessibilityWin::get_nColumns(long* column_count) { | 1536 STDMETHODIMP BrowserAccessibilityWin::get_nColumns(long* column_count) { |
1513 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_N_COLUMNS); | 1537 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_N_COLUMNS); |
| 1538 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
1514 if (!instance_active()) | 1539 if (!instance_active()) |
1515 return E_FAIL; | 1540 return E_FAIL; |
1516 | 1541 |
1517 if (!column_count) | 1542 if (!column_count) |
1518 return E_INVALIDARG; | 1543 return E_INVALIDARG; |
1519 | 1544 |
1520 int columns; | 1545 int columns; |
1521 if (GetIntAttribute( | 1546 if (GetIntAttribute( |
1522 ui::AX_ATTR_TABLE_COLUMN_COUNT, &columns)) { | 1547 ui::AX_ATTR_TABLE_COLUMN_COUNT, &columns)) { |
1523 *column_count = columns; | 1548 *column_count = columns; |
1524 return S_OK; | 1549 return S_OK; |
1525 } | 1550 } |
1526 | 1551 |
1527 return S_FALSE; | 1552 return S_FALSE; |
1528 } | 1553 } |
1529 | 1554 |
1530 STDMETHODIMP BrowserAccessibilityWin::get_nRows(long* row_count) { | 1555 STDMETHODIMP BrowserAccessibilityWin::get_nRows(long* row_count) { |
1531 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_N_ROWS); | 1556 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_N_ROWS); |
| 1557 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
1532 if (!instance_active()) | 1558 if (!instance_active()) |
1533 return E_FAIL; | 1559 return E_FAIL; |
1534 | 1560 |
1535 if (!row_count) | 1561 if (!row_count) |
1536 return E_INVALIDARG; | 1562 return E_INVALIDARG; |
1537 | 1563 |
1538 int rows; | 1564 int rows; |
1539 if (GetIntAttribute(ui::AX_ATTR_TABLE_ROW_COUNT, &rows)) { | 1565 if (GetIntAttribute(ui::AX_ATTR_TABLE_ROW_COUNT, &rows)) { |
1540 *row_count = rows; | 1566 *row_count = rows; |
1541 return S_OK; | 1567 return S_OK; |
1542 } | 1568 } |
1543 | 1569 |
1544 return S_FALSE; | 1570 return S_FALSE; |
1545 } | 1571 } |
1546 | 1572 |
1547 STDMETHODIMP BrowserAccessibilityWin::get_nSelectedChildren(long* cell_count) { | 1573 STDMETHODIMP BrowserAccessibilityWin::get_nSelectedChildren(long* cell_count) { |
1548 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_N_SELECTED_CHILDREN); | 1574 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_N_SELECTED_CHILDREN); |
| 1575 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
1549 if (!instance_active()) | 1576 if (!instance_active()) |
1550 return E_FAIL; | 1577 return E_FAIL; |
1551 | 1578 |
1552 if (!cell_count) | 1579 if (!cell_count) |
1553 return E_INVALIDARG; | 1580 return E_INVALIDARG; |
1554 | 1581 |
1555 // TODO(dmazzoni): add support for selected cells/rows/columns in tables. | 1582 // TODO(dmazzoni): add support for selected cells/rows/columns in tables. |
1556 *cell_count = 0; | 1583 *cell_count = 0; |
1557 return S_OK; | 1584 return S_OK; |
1558 } | 1585 } |
1559 | 1586 |
1560 STDMETHODIMP BrowserAccessibilityWin::get_nSelectedColumns(long* column_count) { | 1587 STDMETHODIMP BrowserAccessibilityWin::get_nSelectedColumns(long* column_count) { |
1561 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_N_SELECTED_COLUMNS); | 1588 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_N_SELECTED_COLUMNS); |
| 1589 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
1562 if (!instance_active()) | 1590 if (!instance_active()) |
1563 return E_FAIL; | 1591 return E_FAIL; |
1564 | 1592 |
1565 if (!column_count) | 1593 if (!column_count) |
1566 return E_INVALIDARG; | 1594 return E_INVALIDARG; |
1567 | 1595 |
1568 *column_count = 0; | 1596 *column_count = 0; |
1569 return S_OK; | 1597 return S_OK; |
1570 } | 1598 } |
1571 | 1599 |
1572 STDMETHODIMP BrowserAccessibilityWin::get_nSelectedRows(long* row_count) { | 1600 STDMETHODIMP BrowserAccessibilityWin::get_nSelectedRows(long* row_count) { |
1573 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_N_SELECTED_ROWS); | 1601 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_N_SELECTED_ROWS); |
| 1602 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
1574 if (!instance_active()) | 1603 if (!instance_active()) |
1575 return E_FAIL; | 1604 return E_FAIL; |
1576 | 1605 |
1577 if (!row_count) | 1606 if (!row_count) |
1578 return E_INVALIDARG; | 1607 return E_INVALIDARG; |
1579 | 1608 |
1580 *row_count = 0; | 1609 *row_count = 0; |
1581 return S_OK; | 1610 return S_OK; |
1582 } | 1611 } |
1583 | 1612 |
1584 STDMETHODIMP BrowserAccessibilityWin::get_rowDescription(long row, | 1613 STDMETHODIMP BrowserAccessibilityWin::get_rowDescription(long row, |
1585 BSTR* description) { | 1614 BSTR* description) { |
1586 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ROW_DESCRIPTION); | 1615 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ROW_DESCRIPTION); |
| 1616 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
1587 if (!instance_active()) | 1617 if (!instance_active()) |
1588 return E_FAIL; | 1618 return E_FAIL; |
1589 | 1619 |
1590 if (!description) | 1620 if (!description) |
1591 return E_INVALIDARG; | 1621 return E_INVALIDARG; |
1592 | 1622 |
1593 int columns; | 1623 int columns; |
1594 int rows; | 1624 int rows; |
1595 if (!GetIntAttribute( | 1625 if (!GetIntAttribute( |
1596 ui::AX_ATTR_TABLE_COLUMN_COUNT, &columns) || | 1626 ui::AX_ATTR_TABLE_COLUMN_COUNT, &columns) || |
(...skipping 26 matching lines...) Expand all Loading... |
1623 } | 1653 } |
1624 } | 1654 } |
1625 | 1655 |
1626 return S_FALSE; | 1656 return S_FALSE; |
1627 } | 1657 } |
1628 | 1658 |
1629 STDMETHODIMP BrowserAccessibilityWin::get_rowExtentAt(long row, | 1659 STDMETHODIMP BrowserAccessibilityWin::get_rowExtentAt(long row, |
1630 long column, | 1660 long column, |
1631 long* n_rows_spanned) { | 1661 long* n_rows_spanned) { |
1632 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ROW_EXTENT_AT); | 1662 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ROW_EXTENT_AT); |
| 1663 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
1633 if (!instance_active()) | 1664 if (!instance_active()) |
1634 return E_FAIL; | 1665 return E_FAIL; |
1635 | 1666 |
1636 if (!n_rows_spanned) | 1667 if (!n_rows_spanned) |
1637 return E_INVALIDARG; | 1668 return E_INVALIDARG; |
1638 | 1669 |
1639 int columns; | 1670 int columns; |
1640 int rows; | 1671 int rows; |
1641 if (!GetIntAttribute( | 1672 if (!GetIntAttribute( |
1642 ui::AX_ATTR_TABLE_COLUMN_COUNT, &columns) || | 1673 ui::AX_ATTR_TABLE_COLUMN_COUNT, &columns) || |
(...skipping 19 matching lines...) Expand all Loading... |
1662 return S_OK; | 1693 return S_OK; |
1663 } | 1694 } |
1664 | 1695 |
1665 return S_FALSE; | 1696 return S_FALSE; |
1666 } | 1697 } |
1667 | 1698 |
1668 STDMETHODIMP BrowserAccessibilityWin::get_rowHeader( | 1699 STDMETHODIMP BrowserAccessibilityWin::get_rowHeader( |
1669 IAccessibleTable** accessible_table, | 1700 IAccessibleTable** accessible_table, |
1670 long* starting_column_index) { | 1701 long* starting_column_index) { |
1671 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ROW_HEADER); | 1702 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ROW_HEADER); |
| 1703 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
1672 // TODO(dmazzoni): implement | 1704 // TODO(dmazzoni): implement |
1673 return E_NOTIMPL; | 1705 return E_NOTIMPL; |
1674 } | 1706 } |
1675 | 1707 |
1676 STDMETHODIMP BrowserAccessibilityWin::get_rowIndex(long cell_index, | 1708 STDMETHODIMP BrowserAccessibilityWin::get_rowIndex(long cell_index, |
1677 long* row_index) { | 1709 long* row_index) { |
1678 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ROW_INDEX); | 1710 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ROW_INDEX); |
| 1711 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
1679 if (!instance_active()) | 1712 if (!instance_active()) |
1680 return E_FAIL; | 1713 return E_FAIL; |
1681 | 1714 |
1682 if (!row_index) | 1715 if (!row_index) |
1683 return E_INVALIDARG; | 1716 return E_INVALIDARG; |
1684 | 1717 |
1685 const std::vector<int32_t>& unique_cell_ids = | 1718 const std::vector<int32_t>& unique_cell_ids = |
1686 GetIntListAttribute(ui::AX_ATTR_UNIQUE_CELL_IDS); | 1719 GetIntListAttribute(ui::AX_ATTR_UNIQUE_CELL_IDS); |
1687 int cell_id_count = static_cast<int>(unique_cell_ids.size()); | 1720 int cell_id_count = static_cast<int>(unique_cell_ids.size()); |
1688 if (cell_index < 0) | 1721 if (cell_index < 0) |
(...skipping 11 matching lines...) Expand all Loading... |
1700 return S_OK; | 1733 return S_OK; |
1701 } | 1734 } |
1702 | 1735 |
1703 return S_FALSE; | 1736 return S_FALSE; |
1704 } | 1737 } |
1705 | 1738 |
1706 STDMETHODIMP BrowserAccessibilityWin::get_selectedChildren(long max_children, | 1739 STDMETHODIMP BrowserAccessibilityWin::get_selectedChildren(long max_children, |
1707 long** children, | 1740 long** children, |
1708 long* n_children) { | 1741 long* n_children) { |
1709 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_SELECTED_CHILDREN); | 1742 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_SELECTED_CHILDREN); |
| 1743 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
1710 if (!instance_active()) | 1744 if (!instance_active()) |
1711 return E_FAIL; | 1745 return E_FAIL; |
1712 | 1746 |
1713 if (!children || !n_children) | 1747 if (!children || !n_children) |
1714 return E_INVALIDARG; | 1748 return E_INVALIDARG; |
1715 | 1749 |
1716 // TODO(dmazzoni): Implement this. | 1750 // TODO(dmazzoni): Implement this. |
1717 *n_children = 0; | 1751 *n_children = 0; |
1718 return S_OK; | 1752 return S_OK; |
1719 } | 1753 } |
1720 | 1754 |
1721 STDMETHODIMP BrowserAccessibilityWin::get_selectedColumns(long max_columns, | 1755 STDMETHODIMP BrowserAccessibilityWin::get_selectedColumns(long max_columns, |
1722 long** columns, | 1756 long** columns, |
1723 long* n_columns) { | 1757 long* n_columns) { |
1724 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_SELECTED_COLUMNS); | 1758 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_SELECTED_COLUMNS); |
| 1759 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
1725 if (!instance_active()) | 1760 if (!instance_active()) |
1726 return E_FAIL; | 1761 return E_FAIL; |
1727 | 1762 |
1728 if (!columns || !n_columns) | 1763 if (!columns || !n_columns) |
1729 return E_INVALIDARG; | 1764 return E_INVALIDARG; |
1730 | 1765 |
1731 // TODO(dmazzoni): Implement this. | 1766 // TODO(dmazzoni): Implement this. |
1732 *n_columns = 0; | 1767 *n_columns = 0; |
1733 return S_OK; | 1768 return S_OK; |
1734 } | 1769 } |
1735 | 1770 |
1736 STDMETHODIMP BrowserAccessibilityWin::get_selectedRows(long max_rows, | 1771 STDMETHODIMP BrowserAccessibilityWin::get_selectedRows(long max_rows, |
1737 long** rows, | 1772 long** rows, |
1738 long* n_rows) { | 1773 long* n_rows) { |
1739 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_SELECTED_ROWS); | 1774 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_SELECTED_ROWS); |
| 1775 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
1740 if (!instance_active()) | 1776 if (!instance_active()) |
1741 return E_FAIL; | 1777 return E_FAIL; |
1742 | 1778 |
1743 if (!rows || !n_rows) | 1779 if (!rows || !n_rows) |
1744 return E_INVALIDARG; | 1780 return E_INVALIDARG; |
1745 | 1781 |
1746 // TODO(dmazzoni): Implement this. | 1782 // TODO(dmazzoni): Implement this. |
1747 *n_rows = 0; | 1783 *n_rows = 0; |
1748 return S_OK; | 1784 return S_OK; |
1749 } | 1785 } |
1750 | 1786 |
1751 STDMETHODIMP BrowserAccessibilityWin::get_summary(IUnknown** accessible) { | 1787 STDMETHODIMP BrowserAccessibilityWin::get_summary(IUnknown** accessible) { |
1752 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_SUMMARY); | 1788 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_SUMMARY); |
| 1789 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
1753 if (!instance_active()) | 1790 if (!instance_active()) |
1754 return E_FAIL; | 1791 return E_FAIL; |
1755 | 1792 |
1756 if (!accessible) | 1793 if (!accessible) |
1757 return E_INVALIDARG; | 1794 return E_INVALIDARG; |
1758 | 1795 |
1759 // TODO(dmazzoni): implement | 1796 // TODO(dmazzoni): implement |
1760 return S_FALSE; | 1797 return S_FALSE; |
1761 } | 1798 } |
1762 | 1799 |
1763 STDMETHODIMP BrowserAccessibilityWin::get_isColumnSelected( | 1800 STDMETHODIMP BrowserAccessibilityWin::get_isColumnSelected( |
1764 long column, | 1801 long column, |
1765 boolean* is_selected) { | 1802 boolean* is_selected) { |
1766 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_IS_COLUMN_SELECTED); | 1803 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_IS_COLUMN_SELECTED); |
| 1804 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
1767 if (!instance_active()) | 1805 if (!instance_active()) |
1768 return E_FAIL; | 1806 return E_FAIL; |
1769 | 1807 |
1770 if (!is_selected) | 1808 if (!is_selected) |
1771 return E_INVALIDARG; | 1809 return E_INVALIDARG; |
1772 | 1810 |
1773 // TODO(dmazzoni): Implement this. | 1811 // TODO(dmazzoni): Implement this. |
1774 *is_selected = false; | 1812 *is_selected = false; |
1775 return S_OK; | 1813 return S_OK; |
1776 } | 1814 } |
1777 | 1815 |
1778 STDMETHODIMP BrowserAccessibilityWin::get_isRowSelected(long row, | 1816 STDMETHODIMP BrowserAccessibilityWin::get_isRowSelected(long row, |
1779 boolean* is_selected) { | 1817 boolean* is_selected) { |
1780 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_IS_ROW_SELECTED); | 1818 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_IS_ROW_SELECTED); |
| 1819 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
1781 if (!instance_active()) | 1820 if (!instance_active()) |
1782 return E_FAIL; | 1821 return E_FAIL; |
1783 | 1822 |
1784 if (!is_selected) | 1823 if (!is_selected) |
1785 return E_INVALIDARG; | 1824 return E_INVALIDARG; |
1786 | 1825 |
1787 // TODO(dmazzoni): Implement this. | 1826 // TODO(dmazzoni): Implement this. |
1788 *is_selected = false; | 1827 *is_selected = false; |
1789 return S_OK; | 1828 return S_OK; |
1790 } | 1829 } |
1791 | 1830 |
1792 STDMETHODIMP BrowserAccessibilityWin::get_isSelected(long row, | 1831 STDMETHODIMP BrowserAccessibilityWin::get_isSelected(long row, |
1793 long column, | 1832 long column, |
1794 boolean* is_selected) { | 1833 boolean* is_selected) { |
1795 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_IS_SELECTED); | 1834 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_IS_SELECTED); |
| 1835 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
1796 if (!instance_active()) | 1836 if (!instance_active()) |
1797 return E_FAIL; | 1837 return E_FAIL; |
1798 | 1838 |
1799 if (!is_selected) | 1839 if (!is_selected) |
1800 return E_INVALIDARG; | 1840 return E_INVALIDARG; |
1801 | 1841 |
1802 // TODO(dmazzoni): Implement this. | 1842 // TODO(dmazzoni): Implement this. |
1803 *is_selected = false; | 1843 *is_selected = false; |
1804 return S_OK; | 1844 return S_OK; |
1805 } | 1845 } |
1806 | 1846 |
1807 STDMETHODIMP BrowserAccessibilityWin::get_rowColumnExtentsAtIndex( | 1847 STDMETHODIMP BrowserAccessibilityWin::get_rowColumnExtentsAtIndex( |
1808 long index, | 1848 long index, |
1809 long* row, | 1849 long* row, |
1810 long* column, | 1850 long* column, |
1811 long* row_extents, | 1851 long* row_extents, |
1812 long* column_extents, | 1852 long* column_extents, |
1813 boolean* is_selected) { | 1853 boolean* is_selected) { |
1814 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ROW_COLUMN_EXTENTS_AT_INDEX); | 1854 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ROW_COLUMN_EXTENTS_AT_INDEX); |
| 1855 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
1815 if (!instance_active()) | 1856 if (!instance_active()) |
1816 return E_FAIL; | 1857 return E_FAIL; |
1817 | 1858 |
1818 if (!row || !column || !row_extents || !column_extents || !is_selected) | 1859 if (!row || !column || !row_extents || !column_extents || !is_selected) |
1819 return E_INVALIDARG; | 1860 return E_INVALIDARG; |
1820 | 1861 |
1821 const std::vector<int32_t>& unique_cell_ids = | 1862 const std::vector<int32_t>& unique_cell_ids = |
1822 GetIntListAttribute(ui::AX_ATTR_UNIQUE_CELL_IDS); | 1863 GetIntListAttribute(ui::AX_ATTR_UNIQUE_CELL_IDS); |
1823 int cell_id_count = static_cast<int>(unique_cell_ids.size()); | 1864 int cell_id_count = static_cast<int>(unique_cell_ids.size()); |
1824 if (index < 0) | 1865 if (index < 0) |
(...skipping 15 matching lines...) Expand all Loading... |
1840 *row_extents = rowspan; | 1881 *row_extents = rowspan; |
1841 *column_extents = colspan; | 1882 *column_extents = colspan; |
1842 return S_OK; | 1883 return S_OK; |
1843 } | 1884 } |
1844 | 1885 |
1845 return S_FALSE; | 1886 return S_FALSE; |
1846 } | 1887 } |
1847 | 1888 |
1848 STDMETHODIMP BrowserAccessibilityWin::selectRow(long row) { | 1889 STDMETHODIMP BrowserAccessibilityWin::selectRow(long row) { |
1849 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_SELECT_ROW); | 1890 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_SELECT_ROW); |
| 1891 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
1850 return E_NOTIMPL; | 1892 return E_NOTIMPL; |
1851 } | 1893 } |
1852 | 1894 |
1853 STDMETHODIMP BrowserAccessibilityWin::selectColumn(long column) { | 1895 STDMETHODIMP BrowserAccessibilityWin::selectColumn(long column) { |
1854 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_SELECT_COLUMN); | 1896 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_SELECT_COLUMN); |
| 1897 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
1855 return E_NOTIMPL; | 1898 return E_NOTIMPL; |
1856 } | 1899 } |
1857 | 1900 |
1858 STDMETHODIMP BrowserAccessibilityWin::unselectRow(long row) { | 1901 STDMETHODIMP BrowserAccessibilityWin::unselectRow(long row) { |
1859 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_UNSELECT_ROW); | 1902 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_UNSELECT_ROW); |
| 1903 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
1860 return E_NOTIMPL; | 1904 return E_NOTIMPL; |
1861 } | 1905 } |
1862 | 1906 |
1863 STDMETHODIMP BrowserAccessibilityWin::unselectColumn(long column) { | 1907 STDMETHODIMP BrowserAccessibilityWin::unselectColumn(long column) { |
1864 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_UNSELECT_COLUMN); | 1908 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_UNSELECT_COLUMN); |
| 1909 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
1865 return E_NOTIMPL; | 1910 return E_NOTIMPL; |
1866 } | 1911 } |
1867 | 1912 |
1868 STDMETHODIMP | 1913 STDMETHODIMP |
1869 BrowserAccessibilityWin::get_modelChange(IA2TableModelChange* model_change) { | 1914 BrowserAccessibilityWin::get_modelChange(IA2TableModelChange* model_change) { |
1870 return E_NOTIMPL; | 1915 return E_NOTIMPL; |
1871 } | 1916 } |
1872 | 1917 |
1873 // | 1918 // |
1874 // IAccessibleTable2 methods. | 1919 // IAccessibleTable2 methods. |
1875 // | 1920 // |
1876 | 1921 |
1877 STDMETHODIMP BrowserAccessibilityWin::get_cellAt(long row, | 1922 STDMETHODIMP BrowserAccessibilityWin::get_cellAt(long row, |
1878 long column, | 1923 long column, |
1879 IUnknown** cell) { | 1924 IUnknown** cell) { |
1880 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_CELL_AT); | 1925 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_CELL_AT); |
| 1926 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
1881 return get_accessibleAt(row, column, cell); | 1927 return get_accessibleAt(row, column, cell); |
1882 } | 1928 } |
1883 | 1929 |
1884 STDMETHODIMP BrowserAccessibilityWin::get_nSelectedCells(long* cell_count) { | 1930 STDMETHODIMP BrowserAccessibilityWin::get_nSelectedCells(long* cell_count) { |
1885 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_N_SELECTED_CELLS); | 1931 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_N_SELECTED_CELLS); |
| 1932 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
1886 return get_nSelectedChildren(cell_count); | 1933 return get_nSelectedChildren(cell_count); |
1887 } | 1934 } |
1888 | 1935 |
1889 STDMETHODIMP BrowserAccessibilityWin::get_selectedCells( | 1936 STDMETHODIMP BrowserAccessibilityWin::get_selectedCells( |
1890 IUnknown*** cells, | 1937 IUnknown*** cells, |
1891 long* n_selected_cells) { | 1938 long* n_selected_cells) { |
1892 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_SELECTED_CELLS); | 1939 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_SELECTED_CELLS); |
| 1940 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
1893 if (!instance_active()) | 1941 if (!instance_active()) |
1894 return E_FAIL; | 1942 return E_FAIL; |
1895 | 1943 |
1896 if (!cells || !n_selected_cells) | 1944 if (!cells || !n_selected_cells) |
1897 return E_INVALIDARG; | 1945 return E_INVALIDARG; |
1898 | 1946 |
1899 // TODO(dmazzoni): Implement this. | 1947 // TODO(dmazzoni): Implement this. |
1900 *n_selected_cells = 0; | 1948 *n_selected_cells = 0; |
1901 return S_OK; | 1949 return S_OK; |
1902 } | 1950 } |
1903 | 1951 |
1904 STDMETHODIMP BrowserAccessibilityWin::get_selectedColumns(long** columns, | 1952 STDMETHODIMP BrowserAccessibilityWin::get_selectedColumns(long** columns, |
1905 long* n_columns) { | 1953 long* n_columns) { |
1906 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_TABLE2_GET_SELECTED_COLUMNS); | 1954 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_TABLE2_GET_SELECTED_COLUMNS); |
| 1955 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
1907 if (!instance_active()) | 1956 if (!instance_active()) |
1908 return E_FAIL; | 1957 return E_FAIL; |
1909 | 1958 |
1910 if (!columns || !n_columns) | 1959 if (!columns || !n_columns) |
1911 return E_INVALIDARG; | 1960 return E_INVALIDARG; |
1912 | 1961 |
1913 // TODO(dmazzoni): Implement this. | 1962 // TODO(dmazzoni): Implement this. |
1914 *n_columns = 0; | 1963 *n_columns = 0; |
1915 return S_OK; | 1964 return S_OK; |
1916 } | 1965 } |
1917 | 1966 |
1918 STDMETHODIMP BrowserAccessibilityWin::get_selectedRows(long** rows, | 1967 STDMETHODIMP BrowserAccessibilityWin::get_selectedRows(long** rows, |
1919 long* n_rows) { | 1968 long* n_rows) { |
1920 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_TABLE2_GET_SELECTED_ROWS); | 1969 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_TABLE2_GET_SELECTED_ROWS); |
| 1970 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
1921 if (!instance_active()) | 1971 if (!instance_active()) |
1922 return E_FAIL; | 1972 return E_FAIL; |
1923 | 1973 |
1924 if (!rows || !n_rows) | 1974 if (!rows || !n_rows) |
1925 return E_INVALIDARG; | 1975 return E_INVALIDARG; |
1926 | 1976 |
1927 // TODO(dmazzoni): Implement this. | 1977 // TODO(dmazzoni): Implement this. |
1928 *n_rows = 0; | 1978 *n_rows = 0; |
1929 return S_OK; | 1979 return S_OK; |
1930 } | 1980 } |
1931 | 1981 |
1932 | 1982 |
1933 // | 1983 // |
1934 // IAccessibleTableCell methods. | 1984 // IAccessibleTableCell methods. |
1935 // | 1985 // |
1936 | 1986 |
1937 STDMETHODIMP BrowserAccessibilityWin::get_columnExtent( | 1987 STDMETHODIMP BrowserAccessibilityWin::get_columnExtent( |
1938 long* n_columns_spanned) { | 1988 long* n_columns_spanned) { |
1939 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_COLUMN_EXTENT); | 1989 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_COLUMN_EXTENT); |
| 1990 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
1940 if (!instance_active()) | 1991 if (!instance_active()) |
1941 return E_FAIL; | 1992 return E_FAIL; |
1942 | 1993 |
1943 if (!n_columns_spanned) | 1994 if (!n_columns_spanned) |
1944 return E_INVALIDARG; | 1995 return E_INVALIDARG; |
1945 | 1996 |
1946 int colspan; | 1997 int colspan; |
1947 if (GetIntAttribute( | 1998 if (GetIntAttribute( |
1948 ui::AX_ATTR_TABLE_CELL_COLUMN_SPAN, &colspan) && | 1999 ui::AX_ATTR_TABLE_CELL_COLUMN_SPAN, &colspan) && |
1949 colspan >= 1) { | 2000 colspan >= 1) { |
1950 *n_columns_spanned = colspan; | 2001 *n_columns_spanned = colspan; |
1951 return S_OK; | 2002 return S_OK; |
1952 } | 2003 } |
1953 | 2004 |
1954 return S_FALSE; | 2005 return S_FALSE; |
1955 } | 2006 } |
1956 | 2007 |
1957 STDMETHODIMP BrowserAccessibilityWin::get_columnHeaderCells( | 2008 STDMETHODIMP BrowserAccessibilityWin::get_columnHeaderCells( |
1958 IUnknown*** cell_accessibles, | 2009 IUnknown*** cell_accessibles, |
1959 long* n_column_header_cells) { | 2010 long* n_column_header_cells) { |
1960 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_COLUMN_HEADER_CELLS); | 2011 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_COLUMN_HEADER_CELLS); |
| 2012 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
1961 if (!instance_active()) | 2013 if (!instance_active()) |
1962 return E_FAIL; | 2014 return E_FAIL; |
1963 | 2015 |
1964 if (!cell_accessibles || !n_column_header_cells) | 2016 if (!cell_accessibles || !n_column_header_cells) |
1965 return E_INVALIDARG; | 2017 return E_INVALIDARG; |
1966 | 2018 |
1967 *n_column_header_cells = 0; | 2019 *n_column_header_cells = 0; |
1968 | 2020 |
1969 int column; | 2021 int column; |
1970 if (!GetIntAttribute( | 2022 if (!GetIntAttribute( |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2012 ToBrowserAccessibilityWin(cell)->NewReference()); | 2064 ToBrowserAccessibilityWin(cell)->NewReference()); |
2013 ++index; | 2065 ++index; |
2014 } | 2066 } |
2015 } | 2067 } |
2016 | 2068 |
2017 return S_OK; | 2069 return S_OK; |
2018 } | 2070 } |
2019 | 2071 |
2020 STDMETHODIMP BrowserAccessibilityWin::get_columnIndex(long* column_index) { | 2072 STDMETHODIMP BrowserAccessibilityWin::get_columnIndex(long* column_index) { |
2021 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_TABLECELL_GET_COLUMN_INDEX); | 2073 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_TABLECELL_GET_COLUMN_INDEX); |
| 2074 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
2022 if (!instance_active()) | 2075 if (!instance_active()) |
2023 return E_FAIL; | 2076 return E_FAIL; |
2024 | 2077 |
2025 if (!column_index) | 2078 if (!column_index) |
2026 return E_INVALIDARG; | 2079 return E_INVALIDARG; |
2027 | 2080 |
2028 int column; | 2081 int column; |
2029 if (GetIntAttribute( | 2082 if (GetIntAttribute( |
2030 ui::AX_ATTR_TABLE_CELL_COLUMN_INDEX, &column)) { | 2083 ui::AX_ATTR_TABLE_CELL_COLUMN_INDEX, &column)) { |
2031 *column_index = column; | 2084 *column_index = column; |
2032 return S_OK; | 2085 return S_OK; |
2033 } | 2086 } |
2034 | 2087 |
2035 return S_FALSE; | 2088 return S_FALSE; |
2036 } | 2089 } |
2037 | 2090 |
2038 STDMETHODIMP BrowserAccessibilityWin::get_rowExtent(long* n_rows_spanned) { | 2091 STDMETHODIMP BrowserAccessibilityWin::get_rowExtent(long* n_rows_spanned) { |
2039 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ROW_EXTENT); | 2092 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ROW_EXTENT); |
| 2093 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
2040 if (!instance_active()) | 2094 if (!instance_active()) |
2041 return E_FAIL; | 2095 return E_FAIL; |
2042 | 2096 |
2043 if (!n_rows_spanned) | 2097 if (!n_rows_spanned) |
2044 return E_INVALIDARG; | 2098 return E_INVALIDARG; |
2045 | 2099 |
2046 int rowspan; | 2100 int rowspan; |
2047 if (GetIntAttribute( | 2101 if (GetIntAttribute( |
2048 ui::AX_ATTR_TABLE_CELL_ROW_SPAN, &rowspan) && | 2102 ui::AX_ATTR_TABLE_CELL_ROW_SPAN, &rowspan) && |
2049 rowspan >= 1) { | 2103 rowspan >= 1) { |
2050 *n_rows_spanned = rowspan; | 2104 *n_rows_spanned = rowspan; |
2051 return S_OK; | 2105 return S_OK; |
2052 } | 2106 } |
2053 | 2107 |
2054 return S_FALSE; | 2108 return S_FALSE; |
2055 } | 2109 } |
2056 | 2110 |
2057 STDMETHODIMP BrowserAccessibilityWin::get_rowHeaderCells( | 2111 STDMETHODIMP BrowserAccessibilityWin::get_rowHeaderCells( |
2058 IUnknown*** cell_accessibles, | 2112 IUnknown*** cell_accessibles, |
2059 long* n_row_header_cells) { | 2113 long* n_row_header_cells) { |
2060 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ROW_HEADER_CELLS); | 2114 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ROW_HEADER_CELLS); |
| 2115 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
2061 if (!instance_active()) | 2116 if (!instance_active()) |
2062 return E_FAIL; | 2117 return E_FAIL; |
2063 | 2118 |
2064 if (!cell_accessibles || !n_row_header_cells) | 2119 if (!cell_accessibles || !n_row_header_cells) |
2065 return E_INVALIDARG; | 2120 return E_INVALIDARG; |
2066 | 2121 |
2067 *n_row_header_cells = 0; | 2122 *n_row_header_cells = 0; |
2068 | 2123 |
2069 int row; | 2124 int row; |
2070 if (!GetIntAttribute( | 2125 if (!GetIntAttribute( |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2112 ToBrowserAccessibilityWin(cell)->NewReference()); | 2167 ToBrowserAccessibilityWin(cell)->NewReference()); |
2113 ++index; | 2168 ++index; |
2114 } | 2169 } |
2115 } | 2170 } |
2116 | 2171 |
2117 return S_OK; | 2172 return S_OK; |
2118 } | 2173 } |
2119 | 2174 |
2120 STDMETHODIMP BrowserAccessibilityWin::get_rowIndex(long* row_index) { | 2175 STDMETHODIMP BrowserAccessibilityWin::get_rowIndex(long* row_index) { |
2121 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_TABLECELL_GET_ROW_INDEX); | 2176 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_TABLECELL_GET_ROW_INDEX); |
| 2177 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
2122 if (!instance_active()) | 2178 if (!instance_active()) |
2123 return E_FAIL; | 2179 return E_FAIL; |
2124 | 2180 |
2125 if (!row_index) | 2181 if (!row_index) |
2126 return E_INVALIDARG; | 2182 return E_INVALIDARG; |
2127 | 2183 |
2128 int row; | 2184 int row; |
2129 if (GetIntAttribute(ui::AX_ATTR_TABLE_CELL_ROW_INDEX, &row)) { | 2185 if (GetIntAttribute(ui::AX_ATTR_TABLE_CELL_ROW_INDEX, &row)) { |
2130 *row_index = row; | 2186 *row_index = row; |
2131 return S_OK; | 2187 return S_OK; |
2132 } | 2188 } |
2133 return S_FALSE; | 2189 return S_FALSE; |
2134 } | 2190 } |
2135 | 2191 |
2136 STDMETHODIMP BrowserAccessibilityWin::get_isSelected(boolean* is_selected) { | 2192 STDMETHODIMP BrowserAccessibilityWin::get_isSelected(boolean* is_selected) { |
2137 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_TABLECELL_GET_IS_SELECTED); | 2193 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_TABLECELL_GET_IS_SELECTED); |
| 2194 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
2138 if (!instance_active()) | 2195 if (!instance_active()) |
2139 return E_FAIL; | 2196 return E_FAIL; |
2140 | 2197 |
2141 if (!is_selected) | 2198 if (!is_selected) |
2142 return E_INVALIDARG; | 2199 return E_INVALIDARG; |
2143 | 2200 |
2144 *is_selected = false; | 2201 *is_selected = false; |
2145 return S_OK; | 2202 return S_OK; |
2146 } | 2203 } |
2147 | 2204 |
2148 STDMETHODIMP BrowserAccessibilityWin::get_rowColumnExtents( | 2205 STDMETHODIMP BrowserAccessibilityWin::get_rowColumnExtents( |
2149 long* row_index, | 2206 long* row_index, |
2150 long* column_index, | 2207 long* column_index, |
2151 long* row_extents, | 2208 long* row_extents, |
2152 long* column_extents, | 2209 long* column_extents, |
2153 boolean* is_selected) { | 2210 boolean* is_selected) { |
2154 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ROW_COLUMN_EXTENTS); | 2211 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ROW_COLUMN_EXTENTS); |
| 2212 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
2155 if (!instance_active()) | 2213 if (!instance_active()) |
2156 return E_FAIL; | 2214 return E_FAIL; |
2157 | 2215 |
2158 if (!row_index || | 2216 if (!row_index || |
2159 !column_index || | 2217 !column_index || |
2160 !row_extents || | 2218 !row_extents || |
2161 !column_extents || | 2219 !column_extents || |
2162 !is_selected) { | 2220 !is_selected) { |
2163 return E_INVALIDARG; | 2221 return E_INVALIDARG; |
2164 } | 2222 } |
(...skipping 15 matching lines...) Expand all Loading... |
2180 *column_extents = colspan; | 2238 *column_extents = colspan; |
2181 *is_selected = false; | 2239 *is_selected = false; |
2182 return S_OK; | 2240 return S_OK; |
2183 } | 2241 } |
2184 | 2242 |
2185 return S_FALSE; | 2243 return S_FALSE; |
2186 } | 2244 } |
2187 | 2245 |
2188 STDMETHODIMP BrowserAccessibilityWin::get_table(IUnknown** table) { | 2246 STDMETHODIMP BrowserAccessibilityWin::get_table(IUnknown** table) { |
2189 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_TABLE); | 2247 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_TABLE); |
| 2248 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
2190 if (!instance_active()) | 2249 if (!instance_active()) |
2191 return E_FAIL; | 2250 return E_FAIL; |
2192 | 2251 |
2193 if (!table) | 2252 if (!table) |
2194 return E_INVALIDARG; | 2253 return E_INVALIDARG; |
2195 | 2254 |
2196 | 2255 |
2197 int row; | 2256 int row; |
2198 int column; | 2257 int column; |
2199 GetIntAttribute(ui::AX_ATTR_TABLE_CELL_ROW_INDEX, &row); | 2258 GetIntAttribute(ui::AX_ATTR_TABLE_CELL_ROW_INDEX, &row); |
(...skipping 12 matching lines...) Expand all Loading... |
2212 | 2271 |
2213 return S_OK; | 2272 return S_OK; |
2214 } | 2273 } |
2215 | 2274 |
2216 // | 2275 // |
2217 // IAccessibleText methods. | 2276 // IAccessibleText methods. |
2218 // | 2277 // |
2219 | 2278 |
2220 STDMETHODIMP BrowserAccessibilityWin::get_nCharacters(LONG* n_characters) { | 2279 STDMETHODIMP BrowserAccessibilityWin::get_nCharacters(LONG* n_characters) { |
2221 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_N_CHARACTERS); | 2280 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_N_CHARACTERS); |
| 2281 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER | |
| 2282 ACCESSIBILITY_MODE_FLAG_INLINE_TEXT_BOXES); |
2222 if (!instance_active()) | 2283 if (!instance_active()) |
2223 return E_FAIL; | 2284 return E_FAIL; |
2224 | 2285 |
2225 if (!n_characters) | 2286 if (!n_characters) |
2226 return E_INVALIDARG; | 2287 return E_INVALIDARG; |
2227 | 2288 |
2228 *n_characters = static_cast<LONG>(GetText().size()); | 2289 *n_characters = static_cast<LONG>(GetText().size()); |
2229 return S_OK; | 2290 return S_OK; |
2230 } | 2291 } |
2231 | 2292 |
2232 STDMETHODIMP BrowserAccessibilityWin::get_caretOffset(LONG* offset) { | 2293 STDMETHODIMP BrowserAccessibilityWin::get_caretOffset(LONG* offset) { |
2233 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_CARET_OFFSET); | 2294 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_CARET_OFFSET); |
| 2295 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
2234 if (!instance_active()) | 2296 if (!instance_active()) |
2235 return E_FAIL; | 2297 return E_FAIL; |
2236 | 2298 |
2237 if (!offset) | 2299 if (!offset) |
2238 return E_INVALIDARG; | 2300 return E_INVALIDARG; |
2239 | 2301 |
2240 if (!HasCaret()) | 2302 if (!HasCaret()) |
2241 return S_FALSE; | 2303 return S_FALSE; |
2242 | 2304 |
2243 int selection_start, selection_end; | 2305 int selection_start, selection_end; |
2244 GetSelectionOffsets(&selection_start, &selection_end); | 2306 GetSelectionOffsets(&selection_start, &selection_end); |
2245 // The caret is always at the end of the selection. | 2307 // The caret is always at the end of the selection. |
2246 *offset = selection_end; | 2308 *offset = selection_end; |
2247 if (*offset < 0) | 2309 if (*offset < 0) |
2248 return S_FALSE; | 2310 return S_FALSE; |
2249 | 2311 |
2250 return S_OK; | 2312 return S_OK; |
2251 } | 2313 } |
2252 | 2314 |
2253 STDMETHODIMP BrowserAccessibilityWin::get_characterExtents( | 2315 STDMETHODIMP BrowserAccessibilityWin::get_characterExtents( |
2254 LONG offset, | 2316 LONG offset, |
2255 IA2CoordinateType coordinate_type, | 2317 IA2CoordinateType coordinate_type, |
2256 LONG* out_x, | 2318 LONG* out_x, |
2257 LONG* out_y, | 2319 LONG* out_y, |
2258 LONG* out_width, | 2320 LONG* out_width, |
2259 LONG* out_height) { | 2321 LONG* out_height) { |
2260 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_CHARACTER_EXTENTS); | 2322 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_CHARACTER_EXTENTS); |
| 2323 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER | |
| 2324 ACCESSIBILITY_MODE_FLAG_INLINE_TEXT_BOXES); |
2261 if (!instance_active()) | 2325 if (!instance_active()) |
2262 return E_FAIL; | 2326 return E_FAIL; |
2263 | 2327 |
2264 if (!out_x || !out_y || !out_width || !out_height) | 2328 if (!out_x || !out_y || !out_width || !out_height) |
2265 return E_INVALIDARG; | 2329 return E_INVALIDARG; |
2266 | 2330 |
2267 const base::string16& text_str = GetText(); | 2331 const base::string16& text_str = GetText(); |
2268 HandleSpecialTextOffset(text_str, &offset); | 2332 HandleSpecialTextOffset(text_str, &offset); |
2269 | 2333 |
2270 if (offset < 0 || offset > static_cast<LONG>(text_str.size())) | 2334 if (offset < 0 || offset > static_cast<LONG>(text_str.size())) |
(...skipping 13 matching lines...) Expand all Loading... |
2284 *out_x = character_bounds.x(); | 2348 *out_x = character_bounds.x(); |
2285 *out_y = character_bounds.y(); | 2349 *out_y = character_bounds.y(); |
2286 *out_width = character_bounds.width(); | 2350 *out_width = character_bounds.width(); |
2287 *out_height = character_bounds.height(); | 2351 *out_height = character_bounds.height(); |
2288 | 2352 |
2289 return S_OK; | 2353 return S_OK; |
2290 } | 2354 } |
2291 | 2355 |
2292 STDMETHODIMP BrowserAccessibilityWin::get_nSelections(LONG* n_selections) { | 2356 STDMETHODIMP BrowserAccessibilityWin::get_nSelections(LONG* n_selections) { |
2293 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_N_SELECTIONS); | 2357 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_N_SELECTIONS); |
| 2358 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
2294 if (!instance_active()) | 2359 if (!instance_active()) |
2295 return E_FAIL; | 2360 return E_FAIL; |
2296 | 2361 |
2297 if (!n_selections) | 2362 if (!n_selections) |
2298 return E_INVALIDARG; | 2363 return E_INVALIDARG; |
2299 | 2364 |
2300 *n_selections = 0; | 2365 *n_selections = 0; |
2301 int selection_start, selection_end; | 2366 int selection_start, selection_end; |
2302 GetSelectionOffsets(&selection_start, &selection_end); | 2367 GetSelectionOffsets(&selection_start, &selection_end); |
2303 if (selection_start >= 0 && selection_end >= 0 && | 2368 if (selection_start >= 0 && selection_end >= 0 && |
2304 selection_start != selection_end) { | 2369 selection_start != selection_end) { |
2305 *n_selections = 1; | 2370 *n_selections = 1; |
2306 } | 2371 } |
2307 | 2372 |
2308 return S_OK; | 2373 return S_OK; |
2309 } | 2374 } |
2310 | 2375 |
2311 STDMETHODIMP BrowserAccessibilityWin::get_selection(LONG selection_index, | 2376 STDMETHODIMP BrowserAccessibilityWin::get_selection(LONG selection_index, |
2312 LONG* start_offset, | 2377 LONG* start_offset, |
2313 LONG* end_offset) { | 2378 LONG* end_offset) { |
2314 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_SELECTION); | 2379 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_SELECTION); |
| 2380 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
2315 if (!instance_active()) | 2381 if (!instance_active()) |
2316 return E_FAIL; | 2382 return E_FAIL; |
2317 | 2383 |
2318 if (!start_offset || !end_offset || selection_index != 0) | 2384 if (!start_offset || !end_offset || selection_index != 0) |
2319 return E_INVALIDARG; | 2385 return E_INVALIDARG; |
2320 | 2386 |
2321 LONG n_selections = 0; | 2387 LONG n_selections = 0; |
2322 if (FAILED(get_nSelections(&n_selections)) || n_selections < 1) | 2388 if (FAILED(get_nSelections(&n_selections)) || n_selections < 1) |
2323 return E_INVALIDARG; | 2389 return E_INVALIDARG; |
2324 | 2390 |
(...skipping 13 matching lines...) Expand all Loading... |
2338 *end_offset = selection_end; | 2404 *end_offset = selection_end; |
2339 } | 2405 } |
2340 | 2406 |
2341 return S_OK; | 2407 return S_OK; |
2342 } | 2408 } |
2343 | 2409 |
2344 STDMETHODIMP BrowserAccessibilityWin::get_text(LONG start_offset, | 2410 STDMETHODIMP BrowserAccessibilityWin::get_text(LONG start_offset, |
2345 LONG end_offset, | 2411 LONG end_offset, |
2346 BSTR* text) { | 2412 BSTR* text) { |
2347 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_TEXT); | 2413 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_TEXT); |
| 2414 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
2348 if (!instance_active()) | 2415 if (!instance_active()) |
2349 return E_FAIL; | 2416 return E_FAIL; |
2350 | 2417 |
2351 if (!text) | 2418 if (!text) |
2352 return E_INVALIDARG; | 2419 return E_INVALIDARG; |
2353 | 2420 |
2354 const base::string16& text_str = GetText(); | 2421 const base::string16& text_str = GetText(); |
2355 HandleSpecialTextOffset(text_str, &start_offset); | 2422 HandleSpecialTextOffset(text_str, &start_offset); |
2356 HandleSpecialTextOffset(text_str, &end_offset); | 2423 HandleSpecialTextOffset(text_str, &end_offset); |
2357 | 2424 |
(...skipping 23 matching lines...) Expand all Loading... |
2381 return S_OK; | 2448 return S_OK; |
2382 } | 2449 } |
2383 | 2450 |
2384 STDMETHODIMP BrowserAccessibilityWin::get_textAtOffset( | 2451 STDMETHODIMP BrowserAccessibilityWin::get_textAtOffset( |
2385 LONG offset, | 2452 LONG offset, |
2386 IA2TextBoundaryType boundary_type, | 2453 IA2TextBoundaryType boundary_type, |
2387 LONG* start_offset, | 2454 LONG* start_offset, |
2388 LONG* end_offset, | 2455 LONG* end_offset, |
2389 BSTR* text) { | 2456 BSTR* text) { |
2390 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_TEXT_AT_OFFSET); | 2457 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_TEXT_AT_OFFSET); |
| 2458 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER | |
| 2459 ACCESSIBILITY_MODE_FLAG_INLINE_TEXT_BOXES); |
2391 if (!instance_active()) | 2460 if (!instance_active()) |
2392 return E_FAIL; | 2461 return E_FAIL; |
2393 | 2462 |
2394 if (!start_offset || !end_offset || !text) | 2463 if (!start_offset || !end_offset || !text) |
2395 return E_INVALIDARG; | 2464 return E_INVALIDARG; |
2396 | 2465 |
2397 const base::string16& text_str = GetText(); | 2466 const base::string16& text_str = GetText(); |
2398 HandleSpecialTextOffset(text_str, &offset); | 2467 HandleSpecialTextOffset(text_str, &offset); |
2399 if (offset < 0) | 2468 if (offset < 0) |
2400 return E_INVALIDARG; | 2469 return E_INVALIDARG; |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2432 return get_text(*start_offset, *end_offset, text); | 2501 return get_text(*start_offset, *end_offset, text); |
2433 } | 2502 } |
2434 | 2503 |
2435 STDMETHODIMP BrowserAccessibilityWin::get_textBeforeOffset( | 2504 STDMETHODIMP BrowserAccessibilityWin::get_textBeforeOffset( |
2436 LONG offset, | 2505 LONG offset, |
2437 IA2TextBoundaryType boundary_type, | 2506 IA2TextBoundaryType boundary_type, |
2438 LONG* start_offset, | 2507 LONG* start_offset, |
2439 LONG* end_offset, | 2508 LONG* end_offset, |
2440 BSTR* text) { | 2509 BSTR* text) { |
2441 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_TEXT_BEFORE_OFFSET); | 2510 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_TEXT_BEFORE_OFFSET); |
| 2511 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER | |
| 2512 ACCESSIBILITY_MODE_FLAG_INLINE_TEXT_BOXES); |
2442 if (!instance_active()) | 2513 if (!instance_active()) |
2443 return E_FAIL; | 2514 return E_FAIL; |
2444 | 2515 |
2445 if (!start_offset || !end_offset || !text) | 2516 if (!start_offset || !end_offset || !text) |
2446 return E_INVALIDARG; | 2517 return E_INVALIDARG; |
2447 | 2518 |
2448 // The IAccessible2 spec says we don't have to implement the "sentence" | 2519 // The IAccessible2 spec says we don't have to implement the "sentence" |
2449 // boundary type, we can just let the screenreader handle it. | 2520 // boundary type, we can just let the screenreader handle it. |
2450 if (boundary_type == IA2_TEXT_BOUNDARY_SENTENCE) { | 2521 if (boundary_type == IA2_TEXT_BOUNDARY_SENTENCE) { |
2451 *start_offset = 0; | 2522 *start_offset = 0; |
(...skipping 10 matching lines...) Expand all Loading... |
2462 return get_text(*start_offset, *end_offset, text); | 2533 return get_text(*start_offset, *end_offset, text); |
2463 } | 2534 } |
2464 | 2535 |
2465 STDMETHODIMP BrowserAccessibilityWin::get_textAfterOffset( | 2536 STDMETHODIMP BrowserAccessibilityWin::get_textAfterOffset( |
2466 LONG offset, | 2537 LONG offset, |
2467 IA2TextBoundaryType boundary_type, | 2538 IA2TextBoundaryType boundary_type, |
2468 LONG* start_offset, | 2539 LONG* start_offset, |
2469 LONG* end_offset, | 2540 LONG* end_offset, |
2470 BSTR* text) { | 2541 BSTR* text) { |
2471 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_TEXT_AFTER_OFFSET); | 2542 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_TEXT_AFTER_OFFSET); |
| 2543 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER | |
| 2544 ACCESSIBILITY_MODE_FLAG_INLINE_TEXT_BOXES); |
2472 if (!instance_active()) | 2545 if (!instance_active()) |
2473 return E_FAIL; | 2546 return E_FAIL; |
2474 | 2547 |
2475 if (!start_offset || !end_offset || !text) | 2548 if (!start_offset || !end_offset || !text) |
2476 return E_INVALIDARG; | 2549 return E_INVALIDARG; |
2477 | 2550 |
2478 // The IAccessible2 spec says we don't have to implement the "sentence" | 2551 // The IAccessible2 spec says we don't have to implement the "sentence" |
2479 // boundary type, we can just let the screenreader handle it. | 2552 // boundary type, we can just let the screenreader handle it. |
2480 if (boundary_type == IA2_TEXT_BOUNDARY_SENTENCE) { | 2553 if (boundary_type == IA2_TEXT_BOUNDARY_SENTENCE) { |
2481 *start_offset = 0; | 2554 *start_offset = 0; |
2482 *end_offset = 0; | 2555 *end_offset = 0; |
2483 *text = NULL; | 2556 *text = NULL; |
2484 return S_FALSE; | 2557 return S_FALSE; |
2485 } | 2558 } |
2486 | 2559 |
2487 const base::string16& text_str = GetText(); | 2560 const base::string16& text_str = GetText(); |
2488 | 2561 |
2489 *start_offset = offset; | 2562 *start_offset = offset; |
2490 *end_offset = FindBoundary( | 2563 *end_offset = FindBoundary( |
2491 text_str, boundary_type, offset, ui::FORWARDS_DIRECTION); | 2564 text_str, boundary_type, offset, ui::FORWARDS_DIRECTION); |
2492 return get_text(*start_offset, *end_offset, text); | 2565 return get_text(*start_offset, *end_offset, text); |
2493 } | 2566 } |
2494 | 2567 |
2495 STDMETHODIMP BrowserAccessibilityWin::get_newText(IA2TextSegment* new_text) { | 2568 STDMETHODIMP BrowserAccessibilityWin::get_newText(IA2TextSegment* new_text) { |
2496 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_NEW_TEXT); | 2569 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_NEW_TEXT); |
| 2570 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
2497 if (!instance_active()) | 2571 if (!instance_active()) |
2498 return E_FAIL; | 2572 return E_FAIL; |
2499 | 2573 |
2500 if (!new_text) | 2574 if (!new_text) |
2501 return E_INVALIDARG; | 2575 return E_INVALIDARG; |
2502 | 2576 |
2503 if (!old_win_attributes_) | 2577 if (!old_win_attributes_) |
2504 return E_FAIL; | 2578 return E_FAIL; |
2505 | 2579 |
2506 int start, old_len, new_len; | 2580 int start, old_len, new_len; |
2507 ComputeHypertextRemovedAndInserted(&start, &old_len, &new_len); | 2581 ComputeHypertextRemovedAndInserted(&start, &old_len, &new_len); |
2508 if (new_len == 0) | 2582 if (new_len == 0) |
2509 return E_FAIL; | 2583 return E_FAIL; |
2510 | 2584 |
2511 base::string16 substr = GetText().substr(start, new_len); | 2585 base::string16 substr = GetText().substr(start, new_len); |
2512 new_text->text = SysAllocString(substr.c_str()); | 2586 new_text->text = SysAllocString(substr.c_str()); |
2513 new_text->start = static_cast<long>(start); | 2587 new_text->start = static_cast<long>(start); |
2514 new_text->end = static_cast<long>(start + new_len); | 2588 new_text->end = static_cast<long>(start + new_len); |
2515 return S_OK; | 2589 return S_OK; |
2516 } | 2590 } |
2517 | 2591 |
2518 STDMETHODIMP BrowserAccessibilityWin::get_oldText(IA2TextSegment* old_text) { | 2592 STDMETHODIMP BrowserAccessibilityWin::get_oldText(IA2TextSegment* old_text) { |
2519 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_OLD_TEXT); | 2593 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_OLD_TEXT); |
| 2594 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
2520 if (!instance_active()) | 2595 if (!instance_active()) |
2521 return E_FAIL; | 2596 return E_FAIL; |
2522 | 2597 |
2523 if (!old_text) | 2598 if (!old_text) |
2524 return E_INVALIDARG; | 2599 return E_INVALIDARG; |
2525 | 2600 |
2526 if (!old_win_attributes_) | 2601 if (!old_win_attributes_) |
2527 return E_FAIL; | 2602 return E_FAIL; |
2528 | 2603 |
2529 int start, old_len, new_len; | 2604 int start, old_len, new_len; |
2530 ComputeHypertextRemovedAndInserted(&start, &old_len, &new_len); | 2605 ComputeHypertextRemovedAndInserted(&start, &old_len, &new_len); |
2531 if (old_len == 0) | 2606 if (old_len == 0) |
2532 return E_FAIL; | 2607 return E_FAIL; |
2533 | 2608 |
2534 base::string16 old_hypertext = old_win_attributes_->hypertext; | 2609 base::string16 old_hypertext = old_win_attributes_->hypertext; |
2535 base::string16 substr = old_hypertext.substr(start, old_len); | 2610 base::string16 substr = old_hypertext.substr(start, old_len); |
2536 old_text->text = SysAllocString(substr.c_str()); | 2611 old_text->text = SysAllocString(substr.c_str()); |
2537 old_text->start = static_cast<long>(start); | 2612 old_text->start = static_cast<long>(start); |
2538 old_text->end = static_cast<long>(start + old_len); | 2613 old_text->end = static_cast<long>(start + old_len); |
2539 return S_OK; | 2614 return S_OK; |
2540 } | 2615 } |
2541 | 2616 |
2542 STDMETHODIMP BrowserAccessibilityWin::get_offsetAtPoint( | 2617 STDMETHODIMP BrowserAccessibilityWin::get_offsetAtPoint( |
2543 LONG x, | 2618 LONG x, |
2544 LONG y, | 2619 LONG y, |
2545 IA2CoordinateType coord_type, | 2620 IA2CoordinateType coord_type, |
2546 LONG* offset) { | 2621 LONG* offset) { |
2547 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_OFFSET_AT_POINT); | 2622 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_OFFSET_AT_POINT); |
| 2623 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER | |
| 2624 ACCESSIBILITY_MODE_FLAG_INLINE_TEXT_BOXES); |
2548 if (!instance_active()) | 2625 if (!instance_active()) |
2549 return E_FAIL; | 2626 return E_FAIL; |
2550 | 2627 |
2551 if (!offset) | 2628 if (!offset) |
2552 return E_INVALIDARG; | 2629 return E_INVALIDARG; |
2553 | 2630 |
2554 // TODO(dmazzoni): implement this. We're returning S_OK for now so that | 2631 // TODO(dmazzoni): implement this. We're returning S_OK for now so that |
2555 // screen readers still return partially accurate results rather than | 2632 // screen readers still return partially accurate results rather than |
2556 // completely failing. | 2633 // completely failing. |
2557 *offset = 0; | 2634 *offset = 0; |
2558 return S_OK; | 2635 return S_OK; |
2559 } | 2636 } |
2560 | 2637 |
2561 STDMETHODIMP BrowserAccessibilityWin::scrollSubstringTo( | 2638 STDMETHODIMP BrowserAccessibilityWin::scrollSubstringTo( |
2562 LONG start_index, | 2639 LONG start_index, |
2563 LONG end_index, | 2640 LONG end_index, |
2564 IA2ScrollType scroll_type) { | 2641 IA2ScrollType scroll_type) { |
2565 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_SCROLL_SUBSTRING_TO); | 2642 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_SCROLL_SUBSTRING_TO); |
| 2643 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER | |
| 2644 ACCESSIBILITY_MODE_FLAG_INLINE_TEXT_BOXES); |
2566 // TODO(dmazzoni): adjust this for the start and end index, too. | 2645 // TODO(dmazzoni): adjust this for the start and end index, too. |
2567 return scrollTo(scroll_type); | 2646 return scrollTo(scroll_type); |
2568 } | 2647 } |
2569 | 2648 |
2570 STDMETHODIMP BrowserAccessibilityWin::scrollSubstringToPoint( | 2649 STDMETHODIMP BrowserAccessibilityWin::scrollSubstringToPoint( |
2571 LONG start_index, | 2650 LONG start_index, |
2572 LONG end_index, | 2651 LONG end_index, |
2573 IA2CoordinateType coordinate_type, | 2652 IA2CoordinateType coordinate_type, |
2574 LONG x, | 2653 LONG x, |
2575 LONG y) { | 2654 LONG y) { |
2576 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_SCROLL_SUBSTRING_TO_POINT); | 2655 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_SCROLL_SUBSTRING_TO_POINT); |
2577 // TODO(dmazzoni): adjust this for the start and end index, too. | 2656 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER | |
| 2657 ACCESSIBILITY_MODE_FLAG_INLINE_TEXT_BOXES); |
| 2658 // TODO(dmazzoni): adjust this for the start and end index, too. |
2578 return scrollToPoint(coordinate_type, x, y); | 2659 return scrollToPoint(coordinate_type, x, y); |
2579 } | 2660 } |
2580 | 2661 |
2581 STDMETHODIMP BrowserAccessibilityWin::addSelection(LONG start_offset, | 2662 STDMETHODIMP BrowserAccessibilityWin::addSelection(LONG start_offset, |
2582 LONG end_offset) { | 2663 LONG end_offset) { |
2583 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_ADD_SELECTION); | 2664 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_ADD_SELECTION); |
| 2665 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
2584 if (!instance_active()) | 2666 if (!instance_active()) |
2585 return E_FAIL; | 2667 return E_FAIL; |
2586 | 2668 |
2587 const base::string16& text_str = GetText(); | 2669 const base::string16& text_str = GetText(); |
2588 HandleSpecialTextOffset(text_str, &start_offset); | 2670 HandleSpecialTextOffset(text_str, &start_offset); |
2589 HandleSpecialTextOffset(text_str, &end_offset); | 2671 HandleSpecialTextOffset(text_str, &end_offset); |
2590 | 2672 |
2591 manager()->SetTextSelection(*this, start_offset, end_offset); | 2673 manager()->SetTextSelection(*this, start_offset, end_offset); |
2592 return S_OK; | 2674 return S_OK; |
2593 } | 2675 } |
2594 | 2676 |
2595 STDMETHODIMP BrowserAccessibilityWin::removeSelection(LONG selection_index) { | 2677 STDMETHODIMP BrowserAccessibilityWin::removeSelection(LONG selection_index) { |
2596 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_REMOVE_SELECTION); | 2678 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_REMOVE_SELECTION); |
| 2679 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
2597 if (!instance_active()) | 2680 if (!instance_active()) |
2598 return E_FAIL; | 2681 return E_FAIL; |
2599 | 2682 |
2600 if (selection_index != 0) | 2683 if (selection_index != 0) |
2601 return E_INVALIDARG; | 2684 return E_INVALIDARG; |
2602 | 2685 |
2603 manager()->SetTextSelection(*this, 0, 0); | 2686 manager()->SetTextSelection(*this, 0, 0); |
2604 return S_OK; | 2687 return S_OK; |
2605 } | 2688 } |
2606 | 2689 |
2607 STDMETHODIMP BrowserAccessibilityWin::setCaretOffset(LONG offset) { | 2690 STDMETHODIMP BrowserAccessibilityWin::setCaretOffset(LONG offset) { |
2608 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_SET_CARET_OFFSET); | 2691 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_SET_CARET_OFFSET); |
| 2692 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
2609 if (!instance_active()) | 2693 if (!instance_active()) |
2610 return E_FAIL; | 2694 return E_FAIL; |
2611 | 2695 |
2612 const base::string16& text_str = GetText(); | 2696 const base::string16& text_str = GetText(); |
2613 HandleSpecialTextOffset(text_str, &offset); | 2697 HandleSpecialTextOffset(text_str, &offset); |
2614 manager()->SetTextSelection(*this, offset, offset); | 2698 manager()->SetTextSelection(*this, offset, offset); |
2615 return S_OK; | 2699 return S_OK; |
2616 } | 2700 } |
2617 | 2701 |
2618 STDMETHODIMP BrowserAccessibilityWin::setSelection(LONG selection_index, | 2702 STDMETHODIMP BrowserAccessibilityWin::setSelection(LONG selection_index, |
2619 LONG start_offset, | 2703 LONG start_offset, |
2620 LONG end_offset) { | 2704 LONG end_offset) { |
2621 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_SET_SELECTION); | 2705 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_SET_SELECTION); |
| 2706 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
2622 if (!instance_active()) | 2707 if (!instance_active()) |
2623 return E_FAIL; | 2708 return E_FAIL; |
2624 | 2709 |
2625 if (selection_index != 0) | 2710 if (selection_index != 0) |
2626 return E_INVALIDARG; | 2711 return E_INVALIDARG; |
2627 | 2712 |
2628 const base::string16& text_str = GetText(); | 2713 const base::string16& text_str = GetText(); |
2629 HandleSpecialTextOffset(text_str, &start_offset); | 2714 HandleSpecialTextOffset(text_str, &start_offset); |
2630 HandleSpecialTextOffset(text_str, &end_offset); | 2715 HandleSpecialTextOffset(text_str, &end_offset); |
2631 | 2716 |
2632 manager()->SetTextSelection(*this, start_offset, end_offset); | 2717 manager()->SetTextSelection(*this, start_offset, end_offset); |
2633 return S_OK; | 2718 return S_OK; |
2634 } | 2719 } |
2635 | 2720 |
2636 STDMETHODIMP BrowserAccessibilityWin::get_attributes(LONG offset, | 2721 STDMETHODIMP BrowserAccessibilityWin::get_attributes(LONG offset, |
2637 LONG* start_offset, | 2722 LONG* start_offset, |
2638 LONG* end_offset, | 2723 LONG* end_offset, |
2639 BSTR* text_attributes) { | 2724 BSTR* text_attributes) { |
2640 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_IATEXT_GET_ATTRIBUTES); | 2725 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_IATEXT_GET_ATTRIBUTES); |
| 2726 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
2641 if (!start_offset || !end_offset || !text_attributes) | 2727 if (!start_offset || !end_offset || !text_attributes) |
2642 return E_INVALIDARG; | 2728 return E_INVALIDARG; |
2643 | 2729 |
2644 *start_offset = *end_offset = 0; | 2730 *start_offset = *end_offset = 0; |
2645 *text_attributes = nullptr; | 2731 *text_attributes = nullptr; |
2646 if (!instance_active()) | 2732 if (!instance_active()) |
2647 return E_FAIL; | 2733 return E_FAIL; |
2648 | 2734 |
2649 const base::string16& text = GetText(); | 2735 const base::string16& text = GetText(); |
2650 HandleSpecialTextOffset(text, &offset); | 2736 HandleSpecialTextOffset(text, &offset); |
(...skipping 18 matching lines...) Expand all Loading... |
2669 DCHECK(*text_attributes); | 2755 DCHECK(*text_attributes); |
2670 return S_OK; | 2756 return S_OK; |
2671 } | 2757 } |
2672 | 2758 |
2673 // | 2759 // |
2674 // IAccessibleHypertext methods. | 2760 // IAccessibleHypertext methods. |
2675 // | 2761 // |
2676 | 2762 |
2677 STDMETHODIMP BrowserAccessibilityWin::get_nHyperlinks(long* hyperlink_count) { | 2763 STDMETHODIMP BrowserAccessibilityWin::get_nHyperlinks(long* hyperlink_count) { |
2678 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_N_HYPERLINKS); | 2764 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_N_HYPERLINKS); |
| 2765 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
2679 if (!instance_active()) | 2766 if (!instance_active()) |
2680 return E_FAIL; | 2767 return E_FAIL; |
2681 | 2768 |
2682 if (!hyperlink_count) | 2769 if (!hyperlink_count) |
2683 return E_INVALIDARG; | 2770 return E_INVALIDARG; |
2684 | 2771 |
2685 *hyperlink_count = hyperlink_offset_to_index().size(); | 2772 *hyperlink_count = hyperlink_offset_to_index().size(); |
2686 return S_OK; | 2773 return S_OK; |
2687 } | 2774 } |
2688 | 2775 |
2689 STDMETHODIMP BrowserAccessibilityWin::get_hyperlink( | 2776 STDMETHODIMP BrowserAccessibilityWin::get_hyperlink( |
2690 long index, | 2777 long index, |
2691 IAccessibleHyperlink** hyperlink) { | 2778 IAccessibleHyperlink** hyperlink) { |
2692 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_HYPERLINK); | 2779 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_HYPERLINK); |
| 2780 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
2693 if (!instance_active()) | 2781 if (!instance_active()) |
2694 return E_FAIL; | 2782 return E_FAIL; |
2695 | 2783 |
2696 if (!hyperlink || | 2784 if (!hyperlink || |
2697 index < 0 || | 2785 index < 0 || |
2698 index >= static_cast<long>(hyperlinks().size())) { | 2786 index >= static_cast<long>(hyperlinks().size())) { |
2699 return E_INVALIDARG; | 2787 return E_INVALIDARG; |
2700 } | 2788 } |
2701 | 2789 |
2702 int32_t id = hyperlinks()[index]; | 2790 int32_t id = hyperlinks()[index]; |
2703 BrowserAccessibilityWin* link = | 2791 BrowserAccessibilityWin* link = |
2704 ToBrowserAccessibilityWin(GetFromUniqueID(id)); | 2792 ToBrowserAccessibilityWin(GetFromUniqueID(id)); |
2705 if (!link) | 2793 if (!link) |
2706 return E_FAIL; | 2794 return E_FAIL; |
2707 | 2795 |
2708 *hyperlink = static_cast<IAccessibleHyperlink*>(link->NewReference()); | 2796 *hyperlink = static_cast<IAccessibleHyperlink*>(link->NewReference()); |
2709 return S_OK; | 2797 return S_OK; |
2710 } | 2798 } |
2711 | 2799 |
2712 STDMETHODIMP BrowserAccessibilityWin::get_hyperlinkIndex( | 2800 STDMETHODIMP BrowserAccessibilityWin::get_hyperlinkIndex( |
2713 long char_index, | 2801 long char_index, |
2714 long* hyperlink_index) { | 2802 long* hyperlink_index) { |
2715 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_HYPERLINK_INDEX); | 2803 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_HYPERLINK_INDEX); |
| 2804 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
2716 if (!instance_active()) | 2805 if (!instance_active()) |
2717 return E_FAIL; | 2806 return E_FAIL; |
2718 | 2807 |
2719 if (!hyperlink_index) | 2808 if (!hyperlink_index) |
2720 return E_INVALIDARG; | 2809 return E_INVALIDARG; |
2721 | 2810 |
2722 if (char_index < 0 || char_index >= static_cast<long>(GetText().size())) { | 2811 if (char_index < 0 || char_index >= static_cast<long>(GetText().size())) { |
2723 return E_INVALIDARG; | 2812 return E_INVALIDARG; |
2724 } | 2813 } |
2725 | 2814 |
2726 std::map<int32_t, int32_t>::iterator it = | 2815 std::map<int32_t, int32_t>::iterator it = |
2727 hyperlink_offset_to_index().find(char_index); | 2816 hyperlink_offset_to_index().find(char_index); |
2728 if (it == hyperlink_offset_to_index().end()) { | 2817 if (it == hyperlink_offset_to_index().end()) { |
2729 *hyperlink_index = -1; | 2818 *hyperlink_index = -1; |
2730 return S_FALSE; | 2819 return S_FALSE; |
2731 } | 2820 } |
2732 | 2821 |
2733 *hyperlink_index = it->second; | 2822 *hyperlink_index = it->second; |
2734 return S_OK; | 2823 return S_OK; |
2735 } | 2824 } |
2736 | 2825 |
2737 // | 2826 // |
2738 // IAccessibleHyperlink methods. | 2827 // IAccessibleHyperlink methods. |
2739 // | 2828 // |
2740 | 2829 |
2741 // Currently, only text links are supported. | 2830 // Currently, only text links are supported. |
2742 STDMETHODIMP BrowserAccessibilityWin::get_anchor(long index, VARIANT* anchor) { | 2831 STDMETHODIMP BrowserAccessibilityWin::get_anchor(long index, VARIANT* anchor) { |
2743 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ANCHOR); | 2832 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ANCHOR); |
| 2833 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
2744 if (!instance_active() || !IsHyperlink()) | 2834 if (!instance_active() || !IsHyperlink()) |
2745 return E_FAIL; | 2835 return E_FAIL; |
2746 | 2836 |
2747 // IA2 text links can have only one anchor, that is the text inside them. | 2837 // IA2 text links can have only one anchor, that is the text inside them. |
2748 if (index != 0 || !anchor) | 2838 if (index != 0 || !anchor) |
2749 return E_INVALIDARG; | 2839 return E_INVALIDARG; |
2750 | 2840 |
2751 BSTR ia2_hypertext = SysAllocString(GetText().c_str()); | 2841 BSTR ia2_hypertext = SysAllocString(GetText().c_str()); |
2752 DCHECK(ia2_hypertext); | 2842 DCHECK(ia2_hypertext); |
2753 anchor->vt = VT_BSTR; | 2843 anchor->vt = VT_BSTR; |
2754 anchor->bstrVal = ia2_hypertext; | 2844 anchor->bstrVal = ia2_hypertext; |
2755 | 2845 |
2756 // Returning S_FALSE is not mentioned in the IA2 Spec, but it might have been | 2846 // Returning S_FALSE is not mentioned in the IA2 Spec, but it might have been |
2757 // an oversight. | 2847 // an oversight. |
2758 if (!SysStringLen(ia2_hypertext)) | 2848 if (!SysStringLen(ia2_hypertext)) |
2759 return S_FALSE; | 2849 return S_FALSE; |
2760 | 2850 |
2761 return S_OK; | 2851 return S_OK; |
2762 } | 2852 } |
2763 | 2853 |
2764 // Currently, only text links are supported. | 2854 // Currently, only text links are supported. |
2765 STDMETHODIMP BrowserAccessibilityWin::get_anchorTarget(long index, | 2855 STDMETHODIMP BrowserAccessibilityWin::get_anchorTarget(long index, |
2766 VARIANT* anchor_target) { | 2856 VARIANT* anchor_target) { |
2767 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ANCHOR_TARGET); | 2857 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ANCHOR_TARGET); |
| 2858 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
2768 if (!instance_active() || !IsHyperlink()) | 2859 if (!instance_active() || !IsHyperlink()) |
2769 return E_FAIL; | 2860 return E_FAIL; |
2770 | 2861 |
2771 // IA2 text links can have at most one target, that is when they represent an | 2862 // IA2 text links can have at most one target, that is when they represent an |
2772 // HTML hyperlink, i.e. an <a> element with a "href" attribute. | 2863 // HTML hyperlink, i.e. an <a> element with a "href" attribute. |
2773 if (index != 0 || !anchor_target) | 2864 if (index != 0 || !anchor_target) |
2774 return E_INVALIDARG; | 2865 return E_INVALIDARG; |
2775 | 2866 |
2776 BSTR target; | 2867 BSTR target; |
2777 if (!(ia_state() & STATE_SYSTEM_LINKED) || | 2868 if (!(ia_state() & STATE_SYSTEM_LINKED) || |
2778 FAILED(GetStringAttributeAsBstr(ui::AX_ATTR_URL, &target))) { | 2869 FAILED(GetStringAttributeAsBstr(ui::AX_ATTR_URL, &target))) { |
2779 target = SysAllocString(L""); | 2870 target = SysAllocString(L""); |
2780 } | 2871 } |
2781 DCHECK(target); | 2872 DCHECK(target); |
2782 anchor_target->vt = VT_BSTR; | 2873 anchor_target->vt = VT_BSTR; |
2783 anchor_target->bstrVal = target; | 2874 anchor_target->bstrVal = target; |
2784 | 2875 |
2785 // Returning S_FALSE is not mentioned in the IA2 Spec, but it might have been | 2876 // Returning S_FALSE is not mentioned in the IA2 Spec, but it might have been |
2786 // an oversight. | 2877 // an oversight. |
2787 if (!SysStringLen(target)) | 2878 if (!SysStringLen(target)) |
2788 return S_FALSE; | 2879 return S_FALSE; |
2789 | 2880 |
2790 return S_OK; | 2881 return S_OK; |
2791 } | 2882 } |
2792 | 2883 |
2793 STDMETHODIMP BrowserAccessibilityWin::get_startIndex(long* index) { | 2884 STDMETHODIMP BrowserAccessibilityWin::get_startIndex(long* index) { |
2794 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_START_INDEX); | 2885 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_START_INDEX); |
| 2886 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
2795 if (!instance_active() || !IsHyperlink()) | 2887 if (!instance_active() || !IsHyperlink()) |
2796 return E_FAIL; | 2888 return E_FAIL; |
2797 | 2889 |
2798 if (!index) | 2890 if (!index) |
2799 return E_INVALIDARG; | 2891 return E_INVALIDARG; |
2800 | 2892 |
2801 int32_t hypertext_offset = 0; | 2893 int32_t hypertext_offset = 0; |
2802 auto* parent = GetParent(); | 2894 auto* parent = GetParent(); |
2803 if (parent) { | 2895 if (parent) { |
2804 hypertext_offset = | 2896 hypertext_offset = |
2805 ToBrowserAccessibilityWin(parent)->GetHypertextOffsetFromChild(*this); | 2897 ToBrowserAccessibilityWin(parent)->GetHypertextOffsetFromChild(*this); |
2806 } | 2898 } |
2807 *index = static_cast<LONG>(hypertext_offset); | 2899 *index = static_cast<LONG>(hypertext_offset); |
2808 return S_OK; | 2900 return S_OK; |
2809 } | 2901 } |
2810 | 2902 |
2811 STDMETHODIMP BrowserAccessibilityWin::get_endIndex(long* index) { | 2903 STDMETHODIMP BrowserAccessibilityWin::get_endIndex(long* index) { |
2812 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_END_INDEX); | 2904 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_END_INDEX); |
| 2905 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
2813 LONG start_index; | 2906 LONG start_index; |
2814 HRESULT hr = get_startIndex(&start_index); | 2907 HRESULT hr = get_startIndex(&start_index); |
2815 if (hr == S_OK) | 2908 if (hr == S_OK) |
2816 *index = start_index + 1; | 2909 *index = start_index + 1; |
2817 return hr; | 2910 return hr; |
2818 } | 2911 } |
2819 | 2912 |
2820 // This method is deprecated in the IA2 Spec. | 2913 // This method is deprecated in the IA2 Spec. |
2821 STDMETHODIMP BrowserAccessibilityWin::get_valid(boolean* valid) { | 2914 STDMETHODIMP BrowserAccessibilityWin::get_valid(boolean* valid) { |
2822 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_VALID); | 2915 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_VALID); |
| 2916 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
2823 return E_NOTIMPL; | 2917 return E_NOTIMPL; |
2824 } | 2918 } |
2825 | 2919 |
2826 // | 2920 // |
2827 // IAccessibleAction partly implemented. | 2921 // IAccessibleAction partly implemented. |
2828 // | 2922 // |
2829 | 2923 |
2830 STDMETHODIMP BrowserAccessibilityWin::nActions(long* n_actions) { | 2924 STDMETHODIMP BrowserAccessibilityWin::nActions(long* n_actions) { |
2831 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_N_ACTIONS); | 2925 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_N_ACTIONS); |
| 2926 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
2832 if (!instance_active()) | 2927 if (!instance_active()) |
2833 return E_FAIL; | 2928 return E_FAIL; |
2834 | 2929 |
2835 if (!n_actions) | 2930 if (!n_actions) |
2836 return E_INVALIDARG; | 2931 return E_INVALIDARG; |
2837 | 2932 |
2838 // |IsHyperlink| is required for |IAccessibleHyperlink::anchor/anchorTarget| | 2933 // |IsHyperlink| is required for |IAccessibleHyperlink::anchor/anchorTarget| |
2839 // to work properly because the |IAccessibleHyperlink| interface inherits from | 2934 // to work properly because the |IAccessibleHyperlink| interface inherits from |
2840 // |IAccessibleAction|. | 2935 // |IAccessibleAction|. |
2841 if (IsHyperlink() || HasIntAttribute(ui::AX_ATTR_ACTION)) { | 2936 if (IsHyperlink() || HasIntAttribute(ui::AX_ATTR_ACTION)) { |
2842 *n_actions = 1; | 2937 *n_actions = 1; |
2843 } else { | 2938 } else { |
2844 *n_actions = 0; | 2939 *n_actions = 0; |
2845 } | 2940 } |
2846 | 2941 |
2847 return S_OK; | 2942 return S_OK; |
2848 } | 2943 } |
2849 | 2944 |
2850 STDMETHODIMP BrowserAccessibilityWin::doAction(long action_index) { | 2945 STDMETHODIMP BrowserAccessibilityWin::doAction(long action_index) { |
2851 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_DO_ACTION); | 2946 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_DO_ACTION); |
| 2947 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
2852 if (!instance_active()) | 2948 if (!instance_active()) |
2853 return E_FAIL; | 2949 return E_FAIL; |
2854 | 2950 |
2855 if (!HasIntAttribute(ui::AX_ATTR_ACTION) || action_index != 0) | 2951 if (!HasIntAttribute(ui::AX_ATTR_ACTION) || action_index != 0) |
2856 return E_INVALIDARG; | 2952 return E_INVALIDARG; |
2857 | 2953 |
2858 manager()->DoDefaultAction(*this); | 2954 manager()->DoDefaultAction(*this); |
2859 return S_OK; | 2955 return S_OK; |
2860 } | 2956 } |
2861 | 2957 |
2862 STDMETHODIMP | 2958 STDMETHODIMP |
2863 BrowserAccessibilityWin::get_description(long action_index, BSTR* description) { | 2959 BrowserAccessibilityWin::get_description(long action_index, BSTR* description) { |
2864 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_IAACTION_GET_DESCRIPTION); | 2960 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_IAACTION_GET_DESCRIPTION); |
| 2961 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
2865 return E_NOTIMPL; | 2962 return E_NOTIMPL; |
2866 } | 2963 } |
2867 | 2964 |
2868 STDMETHODIMP BrowserAccessibilityWin::get_keyBinding(long action_index, | 2965 STDMETHODIMP BrowserAccessibilityWin::get_keyBinding(long action_index, |
2869 long n_max_bindings, | 2966 long n_max_bindings, |
2870 BSTR** key_bindings, | 2967 BSTR** key_bindings, |
2871 long* n_bindings) { | 2968 long* n_bindings) { |
2872 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_KEY_BINDING); | 2969 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_KEY_BINDING); |
| 2970 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
2873 return E_NOTIMPL; | 2971 return E_NOTIMPL; |
2874 } | 2972 } |
2875 | 2973 |
2876 STDMETHODIMP BrowserAccessibilityWin::get_name(long action_index, BSTR* name) { | 2974 STDMETHODIMP BrowserAccessibilityWin::get_name(long action_index, BSTR* name) { |
2877 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_NAME); | 2975 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_NAME); |
| 2976 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
2878 if (!instance_active()) | 2977 if (!instance_active()) |
2879 return E_FAIL; | 2978 return E_FAIL; |
2880 | 2979 |
2881 if (!name) | 2980 if (!name) |
2882 return E_INVALIDARG; | 2981 return E_INVALIDARG; |
2883 | 2982 |
2884 int action; | 2983 int action; |
2885 if (!GetIntAttribute(ui::AX_ATTR_ACTION, &action) || action_index != 0) { | 2984 if (!GetIntAttribute(ui::AX_ATTR_ACTION, &action) || action_index != 0) { |
2886 *name = nullptr; | 2985 *name = nullptr; |
2887 return E_INVALIDARG; | 2986 return E_INVALIDARG; |
2888 } | 2987 } |
2889 | 2988 |
2890 base::string16 action_verb = | 2989 base::string16 action_verb = |
2891 ui::ActionToUnlocalizedString(static_cast<ui::AXSupportedAction>(action)); | 2990 ui::ActionToUnlocalizedString(static_cast<ui::AXSupportedAction>(action)); |
2892 if (action_verb.empty() || action_verb == L"none") { | 2991 if (action_verb.empty() || action_verb == L"none") { |
2893 *name = nullptr; | 2992 *name = nullptr; |
2894 return S_FALSE; | 2993 return S_FALSE; |
2895 } | 2994 } |
2896 | 2995 |
2897 *name = SysAllocString(action_verb.c_str()); | 2996 *name = SysAllocString(action_verb.c_str()); |
2898 DCHECK(name); | 2997 DCHECK(name); |
2899 return S_OK; | 2998 return S_OK; |
2900 } | 2999 } |
2901 | 3000 |
2902 STDMETHODIMP | 3001 STDMETHODIMP |
2903 BrowserAccessibilityWin::get_localizedName(long action_index, | 3002 BrowserAccessibilityWin::get_localizedName(long action_index, |
2904 BSTR* localized_name) { | 3003 BSTR* localized_name) { |
2905 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_LOCALIZED_NAME); | 3004 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_LOCALIZED_NAME); |
| 3005 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
2906 if (!instance_active()) | 3006 if (!instance_active()) |
2907 return E_FAIL; | 3007 return E_FAIL; |
2908 | 3008 |
2909 if (!localized_name) | 3009 if (!localized_name) |
2910 return E_INVALIDARG; | 3010 return E_INVALIDARG; |
2911 | 3011 |
2912 int action; | 3012 int action; |
2913 if (!GetIntAttribute(ui::AX_ATTR_ACTION, &action) || action_index != 0) { | 3013 if (!GetIntAttribute(ui::AX_ATTR_ACTION, &action) || action_index != 0) { |
2914 *localized_name = nullptr; | 3014 *localized_name = nullptr; |
2915 return E_INVALIDARG; | 3015 return E_INVALIDARG; |
(...skipping 10 matching lines...) Expand all Loading... |
2926 DCHECK(localized_name); | 3026 DCHECK(localized_name); |
2927 return S_OK; | 3027 return S_OK; |
2928 } | 3028 } |
2929 | 3029 |
2930 // | 3030 // |
2931 // IAccessibleValue methods. | 3031 // IAccessibleValue methods. |
2932 // | 3032 // |
2933 | 3033 |
2934 STDMETHODIMP BrowserAccessibilityWin::get_currentValue(VARIANT* value) { | 3034 STDMETHODIMP BrowserAccessibilityWin::get_currentValue(VARIANT* value) { |
2935 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_CURRENT_VALUE); | 3035 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_CURRENT_VALUE); |
| 3036 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
2936 if (!instance_active()) | 3037 if (!instance_active()) |
2937 return E_FAIL; | 3038 return E_FAIL; |
2938 | 3039 |
2939 if (!value) | 3040 if (!value) |
2940 return E_INVALIDARG; | 3041 return E_INVALIDARG; |
2941 | 3042 |
2942 float float_val; | 3043 float float_val; |
2943 if (GetFloatAttribute( | 3044 if (GetFloatAttribute( |
2944 ui::AX_ATTR_VALUE_FOR_RANGE, &float_val)) { | 3045 ui::AX_ATTR_VALUE_FOR_RANGE, &float_val)) { |
2945 value->vt = VT_R8; | 3046 value->vt = VT_R8; |
2946 value->dblVal = float_val; | 3047 value->dblVal = float_val; |
2947 return S_OK; | 3048 return S_OK; |
2948 } | 3049 } |
2949 | 3050 |
2950 value->vt = VT_EMPTY; | 3051 value->vt = VT_EMPTY; |
2951 return S_FALSE; | 3052 return S_FALSE; |
2952 } | 3053 } |
2953 | 3054 |
2954 STDMETHODIMP BrowserAccessibilityWin::get_minimumValue(VARIANT* value) { | 3055 STDMETHODIMP BrowserAccessibilityWin::get_minimumValue(VARIANT* value) { |
2955 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_MINIMUM_VALUE); | 3056 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_MINIMUM_VALUE); |
| 3057 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
2956 if (!instance_active()) | 3058 if (!instance_active()) |
2957 return E_FAIL; | 3059 return E_FAIL; |
2958 | 3060 |
2959 if (!value) | 3061 if (!value) |
2960 return E_INVALIDARG; | 3062 return E_INVALIDARG; |
2961 | 3063 |
2962 float float_val; | 3064 float float_val; |
2963 if (GetFloatAttribute(ui::AX_ATTR_MIN_VALUE_FOR_RANGE, | 3065 if (GetFloatAttribute(ui::AX_ATTR_MIN_VALUE_FOR_RANGE, |
2964 &float_val)) { | 3066 &float_val)) { |
2965 value->vt = VT_R8; | 3067 value->vt = VT_R8; |
2966 value->dblVal = float_val; | 3068 value->dblVal = float_val; |
2967 return S_OK; | 3069 return S_OK; |
2968 } | 3070 } |
2969 | 3071 |
2970 value->vt = VT_EMPTY; | 3072 value->vt = VT_EMPTY; |
2971 return S_FALSE; | 3073 return S_FALSE; |
2972 } | 3074 } |
2973 | 3075 |
2974 STDMETHODIMP BrowserAccessibilityWin::get_maximumValue(VARIANT* value) { | 3076 STDMETHODIMP BrowserAccessibilityWin::get_maximumValue(VARIANT* value) { |
2975 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_MAXIMUM_VALUE); | 3077 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_MAXIMUM_VALUE); |
| 3078 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
2976 if (!instance_active()) | 3079 if (!instance_active()) |
2977 return E_FAIL; | 3080 return E_FAIL; |
2978 | 3081 |
2979 if (!value) | 3082 if (!value) |
2980 return E_INVALIDARG; | 3083 return E_INVALIDARG; |
2981 | 3084 |
2982 float float_val; | 3085 float float_val; |
2983 if (GetFloatAttribute(ui::AX_ATTR_MAX_VALUE_FOR_RANGE, | 3086 if (GetFloatAttribute(ui::AX_ATTR_MAX_VALUE_FOR_RANGE, |
2984 &float_val)) { | 3087 &float_val)) { |
2985 value->vt = VT_R8; | 3088 value->vt = VT_R8; |
2986 value->dblVal = float_val; | 3089 value->dblVal = float_val; |
2987 return S_OK; | 3090 return S_OK; |
2988 } | 3091 } |
2989 | 3092 |
2990 value->vt = VT_EMPTY; | 3093 value->vt = VT_EMPTY; |
2991 return S_FALSE; | 3094 return S_FALSE; |
2992 } | 3095 } |
2993 | 3096 |
2994 STDMETHODIMP BrowserAccessibilityWin::setCurrentValue(VARIANT new_value) { | 3097 STDMETHODIMP BrowserAccessibilityWin::setCurrentValue(VARIANT new_value) { |
2995 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_SET_CURRENT_VALUE); | 3098 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_SET_CURRENT_VALUE); |
| 3099 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
2996 // TODO(dmazzoni): Implement this. | 3100 // TODO(dmazzoni): Implement this. |
2997 return E_NOTIMPL; | 3101 return E_NOTIMPL; |
2998 } | 3102 } |
2999 | 3103 |
3000 // | 3104 // |
3001 // ISimpleDOMDocument methods. | 3105 // ISimpleDOMDocument methods. |
3002 // | 3106 // |
3003 | 3107 |
3004 STDMETHODIMP BrowserAccessibilityWin::get_URL(BSTR* url) { | 3108 STDMETHODIMP BrowserAccessibilityWin::get_URL(BSTR* url) { |
3005 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_URL); | 3109 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_URL); |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3095 // | 3199 // |
3096 | 3200 |
3097 STDMETHODIMP BrowserAccessibilityWin::get_nodeInfo( | 3201 STDMETHODIMP BrowserAccessibilityWin::get_nodeInfo( |
3098 BSTR* node_name, | 3202 BSTR* node_name, |
3099 short* name_space_id, | 3203 short* name_space_id, |
3100 BSTR* node_value, | 3204 BSTR* node_value, |
3101 unsigned int* num_children, | 3205 unsigned int* num_children, |
3102 unsigned int* unique_id, | 3206 unsigned int* unique_id, |
3103 unsigned short* node_type) { | 3207 unsigned short* node_type) { |
3104 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_NODE_INFO); | 3208 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_NODE_INFO); |
| 3209 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_HTML); |
3105 if (!instance_active()) | 3210 if (!instance_active()) |
3106 return E_FAIL; | 3211 return E_FAIL; |
3107 | 3212 |
3108 if (!node_name || !name_space_id || !node_value || !num_children || | 3213 if (!node_name || !name_space_id || !node_value || !num_children || |
3109 !unique_id || !node_type) { | 3214 !unique_id || !node_type) { |
3110 return E_INVALIDARG; | 3215 return E_INVALIDARG; |
3111 } | 3216 } |
3112 | 3217 |
3113 base::string16 tag; | 3218 base::string16 tag; |
3114 if (GetString16Attribute(ui::AX_ATTR_HTML_TAG, &tag)) | 3219 if (GetString16Attribute(ui::AX_ATTR_HTML_TAG, &tag)) |
(...skipping 18 matching lines...) Expand all Loading... |
3133 return S_OK; | 3238 return S_OK; |
3134 } | 3239 } |
3135 | 3240 |
3136 STDMETHODIMP BrowserAccessibilityWin::get_attributes( | 3241 STDMETHODIMP BrowserAccessibilityWin::get_attributes( |
3137 unsigned short max_attribs, | 3242 unsigned short max_attribs, |
3138 BSTR* attrib_names, | 3243 BSTR* attrib_names, |
3139 short* name_space_id, | 3244 short* name_space_id, |
3140 BSTR* attrib_values, | 3245 BSTR* attrib_values, |
3141 unsigned short* num_attribs) { | 3246 unsigned short* num_attribs) { |
3142 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_ISIMPLEDOMNODE_GET_ATTRIBUTES); | 3247 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_ISIMPLEDOMNODE_GET_ATTRIBUTES); |
| 3248 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_HTML); |
3143 if (!instance_active()) | 3249 if (!instance_active()) |
3144 return E_FAIL; | 3250 return E_FAIL; |
3145 | 3251 |
3146 if (!attrib_names || !name_space_id || !attrib_values || !num_attribs) | 3252 if (!attrib_names || !name_space_id || !attrib_values || !num_attribs) |
3147 return E_INVALIDARG; | 3253 return E_INVALIDARG; |
3148 | 3254 |
3149 *num_attribs = max_attribs; | 3255 *num_attribs = max_attribs; |
3150 if (*num_attribs > GetHtmlAttributes().size()) | 3256 if (*num_attribs > GetHtmlAttributes().size()) |
3151 *num_attribs = GetHtmlAttributes().size(); | 3257 *num_attribs = GetHtmlAttributes().size(); |
3152 | 3258 |
3153 for (unsigned short i = 0; i < *num_attribs; ++i) { | 3259 for (unsigned short i = 0; i < *num_attribs; ++i) { |
3154 attrib_names[i] = SysAllocString( | 3260 attrib_names[i] = SysAllocString( |
3155 base::UTF8ToUTF16(GetHtmlAttributes()[i].first).c_str()); | 3261 base::UTF8ToUTF16(GetHtmlAttributes()[i].first).c_str()); |
3156 name_space_id[i] = 0; | 3262 name_space_id[i] = 0; |
3157 attrib_values[i] = SysAllocString( | 3263 attrib_values[i] = SysAllocString( |
3158 base::UTF8ToUTF16(GetHtmlAttributes()[i].second).c_str()); | 3264 base::UTF8ToUTF16(GetHtmlAttributes()[i].second).c_str()); |
3159 } | 3265 } |
3160 return S_OK; | 3266 return S_OK; |
3161 } | 3267 } |
3162 | 3268 |
3163 STDMETHODIMP BrowserAccessibilityWin::get_attributesForNames( | 3269 STDMETHODIMP BrowserAccessibilityWin::get_attributesForNames( |
3164 unsigned short num_attribs, | 3270 unsigned short num_attribs, |
3165 BSTR* attrib_names, | 3271 BSTR* attrib_names, |
3166 short* name_space_id, | 3272 short* name_space_id, |
3167 BSTR* attrib_values) { | 3273 BSTR* attrib_values) { |
3168 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ATTRIBUTES_FOR_NAMES); | 3274 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ATTRIBUTES_FOR_NAMES); |
| 3275 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_HTML); |
3169 if (!instance_active()) | 3276 if (!instance_active()) |
3170 return E_FAIL; | 3277 return E_FAIL; |
3171 | 3278 |
3172 if (!attrib_names || !name_space_id || !attrib_values) | 3279 if (!attrib_names || !name_space_id || !attrib_values) |
3173 return E_INVALIDARG; | 3280 return E_INVALIDARG; |
3174 | 3281 |
3175 for (unsigned short i = 0; i < num_attribs; ++i) { | 3282 for (unsigned short i = 0; i < num_attribs; ++i) { |
3176 name_space_id[i] = 0; | 3283 name_space_id[i] = 0; |
3177 bool found = false; | 3284 bool found = false; |
3178 std::string name = base::UTF16ToUTF8((LPCWSTR)attrib_names[i]); | 3285 std::string name = base::UTF16ToUTF8((LPCWSTR)attrib_names[i]); |
(...skipping 12 matching lines...) Expand all Loading... |
3191 return S_OK; | 3298 return S_OK; |
3192 } | 3299 } |
3193 | 3300 |
3194 STDMETHODIMP BrowserAccessibilityWin::get_computedStyle( | 3301 STDMETHODIMP BrowserAccessibilityWin::get_computedStyle( |
3195 unsigned short max_style_properties, | 3302 unsigned short max_style_properties, |
3196 boolean use_alternate_view, | 3303 boolean use_alternate_view, |
3197 BSTR* style_properties, | 3304 BSTR* style_properties, |
3198 BSTR* style_values, | 3305 BSTR* style_values, |
3199 unsigned short *num_style_properties) { | 3306 unsigned short *num_style_properties) { |
3200 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_COMPUTED_STYLE); | 3307 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_COMPUTED_STYLE); |
| 3308 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_HTML); |
3201 if (!instance_active()) | 3309 if (!instance_active()) |
3202 return E_FAIL; | 3310 return E_FAIL; |
3203 | 3311 |
3204 if (!style_properties || !style_values) | 3312 if (!style_properties || !style_values) |
3205 return E_INVALIDARG; | 3313 return E_INVALIDARG; |
3206 | 3314 |
3207 // We only cache a single style property for now: DISPLAY | 3315 // We only cache a single style property for now: DISPLAY |
3208 | 3316 |
3209 base::string16 display; | 3317 base::string16 display; |
3210 if (max_style_properties == 0 || | 3318 if (max_style_properties == 0 || |
3211 !GetString16Attribute(ui::AX_ATTR_DISPLAY, &display)) { | 3319 !GetString16Attribute(ui::AX_ATTR_DISPLAY, &display)) { |
3212 *num_style_properties = 0; | 3320 *num_style_properties = 0; |
3213 return S_OK; | 3321 return S_OK; |
3214 } | 3322 } |
3215 | 3323 |
3216 *num_style_properties = 1; | 3324 *num_style_properties = 1; |
3217 style_properties[0] = SysAllocString(L"display"); | 3325 style_properties[0] = SysAllocString(L"display"); |
3218 style_values[0] = SysAllocString(display.c_str()); | 3326 style_values[0] = SysAllocString(display.c_str()); |
3219 | 3327 |
3220 return S_OK; | 3328 return S_OK; |
3221 } | 3329 } |
3222 | 3330 |
3223 STDMETHODIMP BrowserAccessibilityWin::get_computedStyleForProperties( | 3331 STDMETHODIMP BrowserAccessibilityWin::get_computedStyleForProperties( |
3224 unsigned short num_style_properties, | 3332 unsigned short num_style_properties, |
3225 boolean use_alternate_view, | 3333 boolean use_alternate_view, |
3226 BSTR* style_properties, | 3334 BSTR* style_properties, |
3227 BSTR* style_values) { | 3335 BSTR* style_values) { |
3228 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_COMPUTED_STYLE_FOR_PROPERTIES); | 3336 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_COMPUTED_STYLE_FOR_PROPERTIES); |
| 3337 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_HTML); |
3229 if (!instance_active()) | 3338 if (!instance_active()) |
3230 return E_FAIL; | 3339 return E_FAIL; |
3231 | 3340 |
3232 if (!style_properties || !style_values) | 3341 if (!style_properties || !style_values) |
3233 return E_INVALIDARG; | 3342 return E_INVALIDARG; |
3234 | 3343 |
3235 // We only cache a single style property for now: DISPLAY | 3344 // We only cache a single style property for now: DISPLAY |
3236 | 3345 |
3237 for (unsigned short i = 0; i < num_style_properties; ++i) { | 3346 for (unsigned short i = 0; i < num_style_properties; ++i) { |
3238 base::string16 name = base::ToLowerASCII( | 3347 base::string16 name = base::ToLowerASCII( |
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3360 *node = NULL; | 3469 *node = NULL; |
3361 return S_FALSE; | 3470 return S_FALSE; |
3362 } | 3471 } |
3363 | 3472 |
3364 *node = ToBrowserAccessibilityWin(child)->NewReference(); | 3473 *node = ToBrowserAccessibilityWin(child)->NewReference(); |
3365 return S_OK; | 3474 return S_OK; |
3366 } | 3475 } |
3367 | 3476 |
3368 STDMETHODIMP BrowserAccessibilityWin::get_innerHTML(BSTR* innerHTML) { | 3477 STDMETHODIMP BrowserAccessibilityWin::get_innerHTML(BSTR* innerHTML) { |
3369 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_INNER_HTML); | 3478 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_INNER_HTML); |
| 3479 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_HTML); |
3370 return E_NOTIMPL; | 3480 return E_NOTIMPL; |
3371 } | 3481 } |
3372 | 3482 |
3373 STDMETHODIMP | 3483 STDMETHODIMP |
3374 BrowserAccessibilityWin::get_localInterface(void** local_interface) { | 3484 BrowserAccessibilityWin::get_localInterface(void** local_interface) { |
3375 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_LOCAL_INTERFACE); | 3485 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_LOCAL_INTERFACE); |
| 3486 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_HTML); |
3376 return E_NOTIMPL; | 3487 return E_NOTIMPL; |
3377 } | 3488 } |
3378 | 3489 |
3379 STDMETHODIMP BrowserAccessibilityWin::get_language(BSTR* language) { | 3490 STDMETHODIMP BrowserAccessibilityWin::get_language(BSTR* language) { |
3380 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_LANGUAGE); | 3491 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_LANGUAGE); |
| 3492 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
3381 if (!language) | 3493 if (!language) |
3382 return E_INVALIDARG; | 3494 return E_INVALIDARG; |
3383 *language = nullptr; | 3495 *language = nullptr; |
3384 | 3496 |
3385 if (!instance_active()) | 3497 if (!instance_active()) |
3386 return E_FAIL; | 3498 return E_FAIL; |
3387 | 3499 |
3388 base::string16 lang = GetInheritedString16Attribute(ui::AX_ATTR_LANGUAGE); | 3500 base::string16 lang = GetInheritedString16Attribute(ui::AX_ATTR_LANGUAGE); |
3389 if (lang.empty()) | 3501 if (lang.empty()) |
3390 lang = L"en-US"; | 3502 lang = L"en-US"; |
3391 | 3503 |
3392 *language = SysAllocString(lang.c_str()); | 3504 *language = SysAllocString(lang.c_str()); |
3393 DCHECK(*language); | 3505 DCHECK(*language); |
3394 return S_OK; | 3506 return S_OK; |
3395 } | 3507 } |
3396 | 3508 |
3397 // | 3509 // |
3398 // ISimpleDOMText methods. | 3510 // ISimpleDOMText methods. |
3399 // | 3511 // |
3400 | 3512 |
3401 STDMETHODIMP BrowserAccessibilityWin::get_domText(BSTR* dom_text) { | 3513 STDMETHODIMP BrowserAccessibilityWin::get_domText(BSTR* dom_text) { |
3402 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_DOM_TEXT); | 3514 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_DOM_TEXT); |
| 3515 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
3403 if (!instance_active()) | 3516 if (!instance_active()) |
3404 return E_FAIL; | 3517 return E_FAIL; |
3405 | 3518 |
3406 if (!dom_text) | 3519 if (!dom_text) |
3407 return E_INVALIDARG; | 3520 return E_INVALIDARG; |
3408 | 3521 |
3409 return GetStringAttributeAsBstr( | 3522 return GetStringAttributeAsBstr( |
3410 ui::AX_ATTR_NAME, dom_text); | 3523 ui::AX_ATTR_NAME, dom_text); |
3411 } | 3524 } |
3412 | 3525 |
3413 STDMETHODIMP BrowserAccessibilityWin::get_clippedSubstringBounds( | 3526 STDMETHODIMP BrowserAccessibilityWin::get_clippedSubstringBounds( |
3414 unsigned int start_index, | 3527 unsigned int start_index, |
3415 unsigned int end_index, | 3528 unsigned int end_index, |
3416 int* out_x, | 3529 int* out_x, |
3417 int* out_y, | 3530 int* out_y, |
3418 int* out_width, | 3531 int* out_width, |
3419 int* out_height) { | 3532 int* out_height) { |
3420 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_CLIPPED_SUBSTRING_BOUNDS); | 3533 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_CLIPPED_SUBSTRING_BOUNDS); |
| 3534 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER | |
| 3535 ACCESSIBILITY_MODE_FLAG_INLINE_TEXT_BOXES); |
3421 // TODO(dmazzoni): fully support this API by intersecting the | 3536 // TODO(dmazzoni): fully support this API by intersecting the |
3422 // rect with the container's rect. | 3537 // rect with the container's rect. |
3423 return get_unclippedSubstringBounds( | 3538 return get_unclippedSubstringBounds( |
3424 start_index, end_index, out_x, out_y, out_width, out_height); | 3539 start_index, end_index, out_x, out_y, out_width, out_height); |
3425 } | 3540 } |
3426 | 3541 |
3427 STDMETHODIMP BrowserAccessibilityWin::get_unclippedSubstringBounds( | 3542 STDMETHODIMP BrowserAccessibilityWin::get_unclippedSubstringBounds( |
3428 unsigned int start_index, | 3543 unsigned int start_index, |
3429 unsigned int end_index, | 3544 unsigned int end_index, |
3430 int* out_x, | 3545 int* out_x, |
3431 int* out_y, | 3546 int* out_y, |
3432 int* out_width, | 3547 int* out_width, |
3433 int* out_height) { | 3548 int* out_height) { |
3434 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_UNCLIPPED_SUBSTRING_BOUNDS); | 3549 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_UNCLIPPED_SUBSTRING_BOUNDS); |
| 3550 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER | |
| 3551 ACCESSIBILITY_MODE_FLAG_INLINE_TEXT_BOXES); |
3435 if (!instance_active()) | 3552 if (!instance_active()) |
3436 return E_FAIL; | 3553 return E_FAIL; |
3437 | 3554 |
3438 if (!out_x || !out_y || !out_width || !out_height) | 3555 if (!out_x || !out_y || !out_width || !out_height) |
3439 return E_INVALIDARG; | 3556 return E_INVALIDARG; |
3440 | 3557 |
3441 unsigned int text_length = static_cast<unsigned int>(GetText().size()); | 3558 unsigned int text_length = static_cast<unsigned int>(GetText().size()); |
3442 if (start_index > text_length || end_index > text_length || | 3559 if (start_index > text_length || end_index > text_length || |
3443 start_index > end_index) { | 3560 start_index > end_index) { |
3444 return E_INVALIDARG; | 3561 return E_INVALIDARG; |
3445 } | 3562 } |
3446 | 3563 |
3447 gfx::Rect bounds = GetScreenBoundsForRange( | 3564 gfx::Rect bounds = GetScreenBoundsForRange( |
3448 start_index, end_index - start_index); | 3565 start_index, end_index - start_index); |
3449 *out_x = bounds.x(); | 3566 *out_x = bounds.x(); |
3450 *out_y = bounds.y(); | 3567 *out_y = bounds.y(); |
3451 *out_width = bounds.width(); | 3568 *out_width = bounds.width(); |
3452 *out_height = bounds.height(); | 3569 *out_height = bounds.height(); |
3453 return S_OK; | 3570 return S_OK; |
3454 } | 3571 } |
3455 | 3572 |
3456 STDMETHODIMP BrowserAccessibilityWin::scrollToSubstring( | 3573 STDMETHODIMP BrowserAccessibilityWin::scrollToSubstring( |
3457 unsigned int start_index, | 3574 unsigned int start_index, |
3458 unsigned int end_index) { | 3575 unsigned int end_index) { |
3459 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_SCROLL_TO_SUBSTRING); | 3576 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_SCROLL_TO_SUBSTRING); |
| 3577 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER | |
| 3578 ACCESSIBILITY_MODE_FLAG_INLINE_TEXT_BOXES); |
3460 if (!instance_active()) | 3579 if (!instance_active()) |
3461 return E_FAIL; | 3580 return E_FAIL; |
3462 | 3581 |
3463 unsigned int text_length = static_cast<unsigned int>(GetText().size()); | 3582 unsigned int text_length = static_cast<unsigned int>(GetText().size()); |
3464 if (start_index > text_length || end_index > text_length || | 3583 if (start_index > text_length || end_index > text_length || |
3465 start_index > end_index) { | 3584 start_index > end_index) { |
3466 return E_INVALIDARG; | 3585 return E_INVALIDARG; |
3467 } | 3586 } |
3468 | 3587 |
3469 manager()->ScrollToMakeVisible(*this, GetPageBoundsForRange( | 3588 manager()->ScrollToMakeVisible(*this, GetPageBoundsForRange( |
3470 start_index, end_index - start_index)); | 3589 start_index, end_index - start_index)); |
3471 manager()->ToBrowserAccessibilityManagerWin()->TrackScrollingObject(this); | 3590 manager()->ToBrowserAccessibilityManagerWin()->TrackScrollingObject(this); |
3472 | 3591 |
3473 return S_OK; | 3592 return S_OK; |
3474 } | 3593 } |
3475 | 3594 |
3476 STDMETHODIMP BrowserAccessibilityWin::get_fontFamily(BSTR* font_family) { | 3595 STDMETHODIMP BrowserAccessibilityWin::get_fontFamily(BSTR* font_family) { |
3477 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_FONT_FAMILY); | 3596 WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_FONT_FAMILY); |
| 3597 AddAccessibilityModeFlags(ACCESSIBILITY_MODE_FLAG_SCREEN_READER); |
3478 if (!font_family) | 3598 if (!font_family) |
3479 return E_INVALIDARG; | 3599 return E_INVALIDARG; |
3480 *font_family = nullptr; | 3600 *font_family = nullptr; |
3481 | 3601 |
3482 if (!instance_active()) | 3602 if (!instance_active()) |
3483 return E_FAIL; | 3603 return E_FAIL; |
3484 | 3604 |
3485 base::string16 family = | 3605 base::string16 family = |
3486 GetInheritedString16Attribute(ui::AX_ATTR_FONT_FAMILY); | 3606 GetInheritedString16Attribute(ui::AX_ATTR_FONT_FAMILY); |
3487 if (family.empty()) | 3607 if (family.empty()) |
(...skipping 2070 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5558 return static_cast<BrowserAccessibilityWin*>(obj); | 5678 return static_cast<BrowserAccessibilityWin*>(obj); |
5559 } | 5679 } |
5560 | 5680 |
5561 const BrowserAccessibilityWin* | 5681 const BrowserAccessibilityWin* |
5562 ToBrowserAccessibilityWin(const BrowserAccessibility* obj) { | 5682 ToBrowserAccessibilityWin(const BrowserAccessibility* obj) { |
5563 DCHECK(!obj || obj->IsNative()); | 5683 DCHECK(!obj || obj->IsNative()); |
5564 return static_cast<const BrowserAccessibilityWin*>(obj); | 5684 return static_cast<const BrowserAccessibilityWin*>(obj); |
5565 } | 5685 } |
5566 | 5686 |
5567 } // namespace content | 5687 } // namespace content |
OLD | NEW |