OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2012, Google Inc. All rights reserved. | 2 * Copyright (C) 2012, Google 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 519 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
530 return m_ariaRole; | 530 return m_ariaRole; |
531 if (getNode()->isTextNode()) | 531 if (getNode()->isTextNode()) |
532 return StaticTextRole; | 532 return StaticTextRole; |
533 | 533 |
534 AccessibilityRole role = nativeAccessibilityRoleIgnoringAria(); | 534 AccessibilityRole role = nativeAccessibilityRoleIgnoringAria(); |
535 if (role != UnknownRole) | 535 if (role != UnknownRole) |
536 return role; | 536 return role; |
537 if (getNode()->isElementNode()) { | 537 if (getNode()->isElementNode()) { |
538 Element* element = toElement(getNode()); | 538 Element* element = toElement(getNode()); |
539 if (element->isInCanvasSubtree()) { | 539 if (element->isInCanvasSubtree()) { |
540 getDocument()->updateLayoutTreeForNode(element); | 540 getDocument()->updateStyleAndLayoutTreeForNode(element); |
541 if (element->isFocusable()) | 541 if (element->isFocusable()) |
542 return GroupRole; | 542 return GroupRole; |
543 } | 543 } |
544 } | 544 } |
545 return UnknownRole; | 545 return UnknownRole; |
546 } | 546 } |
547 | 547 |
548 AccessibilityRole AXNodeObject::determineAriaRoleAttribute() const | 548 AccessibilityRole AXNodeObject::determineAriaRoleAttribute() const |
549 { | 549 { |
550 const AtomicString& ariaRole = getAttribute(roleAttr); | 550 const AtomicString& ariaRole = getAttribute(roleAttr); |
(...skipping 2268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2819 return placeholder; | 2819 return placeholder; |
2820 } | 2820 } |
2821 | 2821 |
2822 DEFINE_TRACE(AXNodeObject) | 2822 DEFINE_TRACE(AXNodeObject) |
2823 { | 2823 { |
2824 visitor->trace(m_node); | 2824 visitor->trace(m_node); |
2825 AXObject::trace(visitor); | 2825 AXObject::trace(visitor); |
2826 } | 2826 } |
2827 | 2827 |
2828 } // namespace blink | 2828 } // namespace blink |
OLD | NEW |