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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
49 PassRefPtr<AXTableRow> AXTableRow::create(RenderObject* renderer) | 49 PassRefPtr<AXTableRow> AXTableRow::create(RenderObject* renderer) |
50 { | 50 { |
51 return adoptRef(new AXTableRow(renderer)); | 51 return adoptRef(new AXTableRow(renderer)); |
52 } | 52 } |
53 | 53 |
54 AccessibilityRole AXTableRow::determineAccessibilityRole() | 54 AccessibilityRole AXTableRow::determineAccessibilityRole() |
55 { | 55 { |
56 if (!isTableRow()) | 56 if (!isTableRow()) |
57 return AXRenderObject::determineAccessibilityRole(); | 57 return AXRenderObject::determineAccessibilityRole(); |
58 | 58 |
59 m_ariaRole = determineAriaRoleAttribute(); | 59 if ((m_ariaRole = determineAriaRoleAttribute()) != UnknownRole) |
60 | 60 return m_ariaRole; |
61 AccessibilityRole ariaRole = ariaRoleAttribute(); | |
62 if (ariaRole != UnknownRole) | |
63 return ariaRole; | |
64 | 61 |
65 return RowRole; | 62 return RowRole; |
66 } | 63 } |
67 | 64 |
68 bool AXTableRow::isTableRow() const | 65 bool AXTableRow::isTableRow() const |
69 { | 66 { |
70 AXObject* table = parentTable(); | 67 AXObject* table = parentTable(); |
71 if (!table || !table->isAXTable()) | 68 if (!table || !table->isAXTable()) |
72 return false; | 69 return false; |
73 | 70 |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
122 return 0; | 119 return 0; |
123 | 120 |
124 Node* cellNode = cellRenderer->node(); | 121 Node* cellNode = cellRenderer->node(); |
125 if (!cellNode || !cellNode->hasTagName(thTag)) | 122 if (!cellNode || !cellNode->hasTagName(thTag)) |
126 return 0; | 123 return 0; |
127 | 124 |
128 return cell; | 125 return cell; |
129 } | 126 } |
130 | 127 |
131 } // namespace blink | 128 } // namespace blink |
OLD | NEW |