| 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 371 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 382 bool AXObject::IsDetached() const { | 382 bool AXObject::IsDetached() const { |
| 383 return !ax_object_cache_; | 383 return !ax_object_cache_; |
| 384 } | 384 } |
| 385 | 385 |
| 386 const AtomicString& AXObject::GetAOMPropertyOrARIAAttribute( | 386 const AtomicString& AXObject::GetAOMPropertyOrARIAAttribute( |
| 387 AOMStringProperty property) const { | 387 AOMStringProperty property) const { |
| 388 Node* node = this->GetNode(); | 388 Node* node = this->GetNode(); |
| 389 if (!node || !node->IsElementNode()) | 389 if (!node || !node->IsElementNode()) |
| 390 return g_null_atom; | 390 return g_null_atom; |
| 391 | 391 |
| 392 return AccessibleNode::GetProperty(ToElement(node), property); | 392 return AccessibleNode::GetPropertyOrARIAAttribute(ToElement(node), property); |
| 393 } | 393 } |
| 394 | 394 |
| 395 bool AXObject::IsARIATextControl() const { | 395 bool AXObject::IsARIATextControl() const { |
| 396 return AriaRoleAttribute() == kTextFieldRole || | 396 return AriaRoleAttribute() == kTextFieldRole || |
| 397 AriaRoleAttribute() == kSearchBoxRole || | 397 AriaRoleAttribute() == kSearchBoxRole || |
| 398 AriaRoleAttribute() == kComboBoxRole; | 398 AriaRoleAttribute() == kComboBoxRole; |
| 399 } | 399 } |
| 400 | 400 |
| 401 bool AXObject::IsButton() const { | 401 bool AXObject::IsButton() const { |
| 402 AccessibilityRole role = RoleValue(); | 402 AccessibilityRole role = RoleValue(); |
| (...skipping 1459 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1862 } | 1862 } |
| 1863 | 1863 |
| 1864 DEFINE_TRACE(AXObject) { | 1864 DEFINE_TRACE(AXObject) { |
| 1865 visitor->Trace(children_); | 1865 visitor->Trace(children_); |
| 1866 visitor->Trace(parent_); | 1866 visitor->Trace(parent_); |
| 1867 visitor->Trace(cached_live_region_root_); | 1867 visitor->Trace(cached_live_region_root_); |
| 1868 visitor->Trace(ax_object_cache_); | 1868 visitor->Trace(ax_object_cache_); |
| 1869 } | 1869 } |
| 1870 | 1870 |
| 1871 } // namespace blink | 1871 } // namespace blink |
| OLD | NEW |