Chromium Code Reviews| 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 262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 273 return LinkRole; | 273 return LinkRole; |
| 274 } | 274 } |
| 275 if (cssBox && cssBox->isListItem()) | 275 if (cssBox && cssBox->isListItem()) |
| 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)) { | |
| 284 if (isHTMLDetailsElement(m_renderer->parent()->node())) | |
|
Mike West
2014/09/25 13:08:01
I think you need to null-check parent() here. Othe
dmazzoni
2014/09/25 15:19:49
Also, I think it'd be more correct to check node->
| |
| 285 return DisclosureTriangleRole; | |
| 286 return UnknownRole; | |
| 287 } | |
| 283 if (isHTMLLegendElement(node)) | 288 if (isHTMLLegendElement(node)) |
| 284 return LegendRole; | 289 return LegendRole; |
| 285 if (m_renderer->isText()) | 290 if (m_renderer->isText()) |
| 286 return StaticTextRole; | 291 return StaticTextRole; |
| 287 if (cssBox && cssBox->isImage()) { | 292 if (cssBox && cssBox->isImage()) { |
| 288 if (isHTMLInputElement(node)) | 293 if (isHTMLInputElement(node)) |
| 289 return ariaHasPopup() ? PopUpButtonRole : ButtonRole; | 294 return ariaHasPopup() ? PopUpButtonRole : ButtonRole; |
| 290 if (isSVGImage()) | 295 if (isSVGImage()) |
| 291 return SVGRootRole; | 296 return SVGRootRole; |
| 292 return ImageRole; | 297 return ImageRole; |
| (...skipping 2056 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2349 if (label && label->renderer()) { | 2354 if (label && label->renderer()) { |
| 2350 LayoutRect labelRect = axObjectCache()->getOrCreate(label)->elementR ect(); | 2355 LayoutRect labelRect = axObjectCache()->getOrCreate(label)->elementR ect(); |
| 2351 result.unite(labelRect); | 2356 result.unite(labelRect); |
| 2352 } | 2357 } |
| 2353 } | 2358 } |
| 2354 | 2359 |
| 2355 return result; | 2360 return result; |
| 2356 } | 2361 } |
| 2357 | 2362 |
| 2358 } // namespace blink | 2363 } // namespace blink |
| OLD | NEW |