| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Apple Inc. All Rights Reserved. | 2 * Copyright (C) 2010 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 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 129 | 129 |
| 130 return grandparent->elementRect(); | 130 return grandparent->elementRect(); |
| 131 } | 131 } |
| 132 | 132 |
| 133 String AXMenuListOption::textAlternative(bool recursive, bool inAriaLabelledByTr
aversal, AXObjectSet& visited, AXNameFrom& nameFrom, AXRelatedObjectVector* rela
tedObjects, NameSources* nameSources) const | 133 String AXMenuListOption::textAlternative(bool recursive, bool inAriaLabelledByTr
aversal, AXObjectSet& visited, AXNameFrom& nameFrom, AXRelatedObjectVector* rela
tedObjects, NameSources* nameSources) const |
| 134 { | 134 { |
| 135 // If nameSources is non-null, relatedObjects is used in filling it in, so i
t must be non-null as well. | 135 // If nameSources is non-null, relatedObjects is used in filling it in, so i
t must be non-null as well. |
| 136 if (nameSources) | 136 if (nameSources) |
| 137 ASSERT(relatedObjects); | 137 ASSERT(relatedObjects); |
| 138 | 138 |
| 139 if (!node()) | 139 if (!getNode()) |
| 140 return String(); | 140 return String(); |
| 141 | 141 |
| 142 bool foundTextAlternative = false; | 142 bool foundTextAlternative = false; |
| 143 String textAlternative = ariaTextAlternative(recursive, inAriaLabelledByTrav
ersal, visited, nameFrom, relatedObjects, nameSources, &foundTextAlternative); | 143 String textAlternative = ariaTextAlternative(recursive, inAriaLabelledByTrav
ersal, visited, nameFrom, relatedObjects, nameSources, &foundTextAlternative); |
| 144 if (foundTextAlternative && !nameSources) | 144 if (foundTextAlternative && !nameSources) |
| 145 return textAlternative; | 145 return textAlternative; |
| 146 | 146 |
| 147 nameFrom = AXNameFromContents; | 147 nameFrom = AXNameFromContents; |
| 148 textAlternative = m_element->displayLabel(); | 148 textAlternative = m_element->displayLabel(); |
| 149 if (nameSources) { | 149 if (nameSources) { |
| 150 nameSources->append(NameSource(foundTextAlternative)); | 150 nameSources->append(NameSource(foundTextAlternative)); |
| 151 nameSources->last().type = nameFrom; | 151 nameSources->last().type = nameFrom; |
| 152 nameSources->last().text = textAlternative; | 152 nameSources->last().text = textAlternative; |
| 153 foundTextAlternative = true; | 153 foundTextAlternative = true; |
| 154 } | 154 } |
| 155 | 155 |
| 156 return textAlternative; | 156 return textAlternative; |
| 157 | 157 |
| 158 } | 158 } |
| 159 | 159 |
| 160 DEFINE_TRACE(AXMenuListOption) | 160 DEFINE_TRACE(AXMenuListOption) |
| 161 { | 161 { |
| 162 visitor->trace(m_element); | 162 visitor->trace(m_element); |
| 163 AXMockObject::trace(visitor); | 163 AXMockObject::trace(visitor); |
| 164 } | 164 } |
| 165 | 165 |
| 166 } // namespace blink | 166 } // namespace blink |
| OLD | NEW |