| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2008 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 265 if (ariaRole != UnknownRole) | 265 if (ariaRole != UnknownRole) |
| 266 return ariaRole; | 266 return ariaRole; |
| 267 | 267 |
| 268 RenderBoxModelObject* cssBox = renderBoxModelObject(); | 268 RenderBoxModelObject* cssBox = renderBoxModelObject(); |
| 269 | 269 |
| 270 if (node && node->isLink()) { | 270 if (node && node->isLink()) { |
| 271 if (cssBox && cssBox->isImage()) | 271 if (cssBox && cssBox->isImage()) |
| 272 return ImageMapRole; | 272 return ImageMapRole; |
| 273 return LinkRole; | 273 return LinkRole; |
| 274 } | 274 } |
| 275 if (cssBox && cssBox->isListItem()) | 275 if ((cssBox && cssBox->isListItem()) || isHTMLLIElement(node)) |
| 276 return ListItemRole; | 276 return ListItemRole; |
| 277 if (m_renderer->isListMarker()) | 277 if (m_renderer->isListMarker()) |
| 278 return ListMarkerRole; | 278 return ListMarkerRole; |
| 279 if (isHTMLButtonElement(node)) | 279 if (isHTMLButtonElement(node)) |
| 280 return buttonRoleType(); | 280 return buttonRoleType(); |
| 281 if (isHTMLDetailsElement(node)) | 281 if (isHTMLDetailsElement(node)) |
| 282 return DetailsRole; | 282 return DetailsRole; |
| 283 if (isHTMLSummaryElement(node)) { | 283 if (isHTMLSummaryElement(node)) { |
| 284 if (node->parentElement() && isHTMLDetailsElement(node->parentElement())
) | 284 if (node->parentElement() && isHTMLDetailsElement(node->parentElement())
) |
| 285 return DisclosureTriangleRole; | 285 return DisclosureTriangleRole; |
| (...skipping 2097 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2383 if (label && label->renderer()) { | 2383 if (label && label->renderer()) { |
| 2384 LayoutRect labelRect = axObjectCache()->getOrCreate(label)->elementR
ect(); | 2384 LayoutRect labelRect = axObjectCache()->getOrCreate(label)->elementR
ect(); |
| 2385 result.unite(labelRect); | 2385 result.unite(labelRect); |
| 2386 } | 2386 } |
| 2387 } | 2387 } |
| 2388 | 2388 |
| 2389 return result; | 2389 return result; |
| 2390 } | 2390 } |
| 2391 | 2391 |
| 2392 } // namespace blink | 2392 } // namespace blink |
| OLD | NEW |