| 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 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 142 bool foundTextAlternative = false; | 142 bool foundTextAlternative = false; |
| 143 String textAlternative = ariaTextAlternative( | 143 String textAlternative = ariaTextAlternative( |
| 144 recursive, inAriaLabelledByTraversal, visited, nameFrom, relatedObjects, | 144 recursive, inAriaLabelledByTraversal, visited, nameFrom, relatedObjects, |
| 145 nameSources, &foundTextAlternative); | 145 nameSources, &foundTextAlternative); |
| 146 if (foundTextAlternative && !nameSources) | 146 if (foundTextAlternative && !nameSources) |
| 147 return textAlternative; | 147 return textAlternative; |
| 148 | 148 |
| 149 nameFrom = AXNameFromContents; | 149 nameFrom = AXNameFromContents; |
| 150 textAlternative = m_element->displayLabel(); | 150 textAlternative = m_element->displayLabel(); |
| 151 if (nameSources) { | 151 if (nameSources) { |
| 152 nameSources->append(NameSource(foundTextAlternative)); | 152 nameSources->push_back(NameSource(foundTextAlternative)); |
| 153 nameSources->back().type = nameFrom; | 153 nameSources->back().type = nameFrom; |
| 154 nameSources->back().text = textAlternative; | 154 nameSources->back().text = textAlternative; |
| 155 foundTextAlternative = true; | 155 foundTextAlternative = true; |
| 156 } | 156 } |
| 157 | 157 |
| 158 return textAlternative; | 158 return textAlternative; |
| 159 } | 159 } |
| 160 | 160 |
| 161 DEFINE_TRACE(AXMenuListOption) { | 161 DEFINE_TRACE(AXMenuListOption) { |
| 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 |