| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2008, 2009, 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2008, 2009, 2011 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 369 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 380 return AccessibleNode::GetPropertyOrARIAAttribute(element, property); | 380 return AccessibleNode::GetPropertyOrARIAAttribute(element, property); |
| 381 return g_null_atom; | 381 return g_null_atom; |
| 382 } | 382 } |
| 383 | 383 |
| 384 Element* AXObject::GetAOMPropertyOrARIAAttribute( | 384 Element* AXObject::GetAOMPropertyOrARIAAttribute( |
| 385 AOMRelationProperty property) const { | 385 AOMRelationProperty property) const { |
| 386 Element* element = this->GetElement(); | 386 Element* element = this->GetElement(); |
| 387 if (!element) | 387 if (!element) |
| 388 return nullptr; | 388 return nullptr; |
| 389 | 389 |
| 390 AccessibleNode* target = | 390 return AccessibleNode::GetPropertyOrARIAAttribute(element, property); |
| 391 AccessibleNode::GetPropertyOrARIAAttribute(element, property); | |
| 392 return target ? target->element() : nullptr; | |
| 393 } | 391 } |
| 394 | 392 |
| 395 bool AXObject::HasAOMProperty(AOMRelationListProperty property, | 393 bool AXObject::HasAOMProperty(AOMRelationListProperty property, |
| 396 HeapVector<Member<Element>>& result) const { | 394 HeapVector<Member<Element>>& result) const { |
| 397 Element* element = this->GetElement(); | 395 Element* element = this->GetElement(); |
| 398 if (!element) | 396 if (!element) |
| 399 return false; | 397 return false; |
| 400 | 398 |
| 401 return AccessibleNode::GetProperty(element, property, result); | 399 return AccessibleNode::GetProperty(element, property, result); |
| 402 } | 400 } |
| (...skipping 1823 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2226 } | 2224 } |
| 2227 | 2225 |
| 2228 DEFINE_TRACE(AXObject) { | 2226 DEFINE_TRACE(AXObject) { |
| 2229 visitor->Trace(children_); | 2227 visitor->Trace(children_); |
| 2230 visitor->Trace(parent_); | 2228 visitor->Trace(parent_); |
| 2231 visitor->Trace(cached_live_region_root_); | 2229 visitor->Trace(cached_live_region_root_); |
| 2232 visitor->Trace(ax_object_cache_); | 2230 visitor->Trace(ax_object_cache_); |
| 2233 } | 2231 } |
| 2234 | 2232 |
| 2235 } // namespace blink | 2233 } // namespace blink |
| OLD | NEW |