| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Apple Inc. All rights reserved. | 2 * Copyright (C) 2009 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 11 matching lines...) Expand all Loading... |
| 22 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 22 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
| 23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | 23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
| 24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 27 */ | 27 */ |
| 28 | 28 |
| 29 #include "config.h" | 29 #include "config.h" |
| 30 #include "modules/accessibility/AXARIAGrid.h" | 30 #include "modules/accessibility/AXARIAGrid.h" |
| 31 | 31 |
| 32 #include "core/dom/AXObjectCache.h" |
| 32 #include "core/rendering/RenderObject.h" | 33 #include "core/rendering/RenderObject.h" |
| 33 #include "modules/accessibility/AXObjectCacheImpl.h" | 34 #include "modules/accessibility/AXObjectCacheImpl.h" |
| 34 #include "modules/accessibility/AXTableColumn.h" | 35 #include "modules/accessibility/AXTableColumn.h" |
| 35 #include "modules/accessibility/AXTableRow.h" | 36 #include "modules/accessibility/AXTableRow.h" |
| 36 | 37 |
| 37 | 38 |
| 38 namespace blink { | 39 namespace blink { |
| 39 | 40 |
| 40 AXARIAGrid::AXARIAGrid(RenderObject* renderer) | 41 AXARIAGrid::AXARIAGrid(RenderObject* renderer, AXObjectCache* axObjectCache) |
| 41 : AXTable(renderer) | 42 : AXTable(renderer, axObjectCache) |
| 42 { | 43 { |
| 43 } | 44 } |
| 44 | 45 |
| 45 AXARIAGrid::~AXARIAGrid() | 46 AXARIAGrid::~AXARIAGrid() |
| 46 { | 47 { |
| 47 } | 48 } |
| 48 | 49 |
| 49 PassRefPtr<AXARIAGrid> AXARIAGrid::create(RenderObject* renderer) | 50 PassRefPtr<AXARIAGrid> AXARIAGrid::create(RenderObject* renderer, AXObjectCache*
axObjectCache) |
| 50 { | 51 { |
| 51 return adoptRef(new AXARIAGrid(renderer)); | 52 return adoptRef(new AXARIAGrid(renderer, axObjectCache)); |
| 52 } | 53 } |
| 53 | 54 |
| 54 bool AXARIAGrid::addTableCellChild(AXObject* child, HashSet<AXObject*>& appended
Rows, unsigned& columnCount) | 55 bool AXARIAGrid::addTableCellChild(AXObject* child, HashSet<AXObject*>& appended
Rows, unsigned& columnCount) |
| 55 { | 56 { |
| 56 if (!child || !child->isTableRow() || child->ariaRoleAttribute() != RowRole) | 57 if (!child || !child->isTableRow() || child->ariaRoleAttribute() != RowRole) |
| 57 return false; | 58 return false; |
| 58 | 59 |
| 59 AXTableRow* row = toAXTableRow(child); | 60 AXTableRow* row = toAXTableRow(child); |
| 60 if (appendedRows.contains(row)) | 61 if (appendedRows.contains(row)) |
| 61 return false; | 62 return false; |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 123 if (!column->accessibilityIsIgnored()) | 124 if (!column->accessibilityIsIgnored()) |
| 124 m_children.append(column); | 125 m_children.append(column); |
| 125 } | 126 } |
| 126 | 127 |
| 127 AXObject* headerContainerObject = headerContainer(); | 128 AXObject* headerContainerObject = headerContainer(); |
| 128 if (headerContainerObject && !headerContainerObject->accessibilityIsIgnored(
)) | 129 if (headerContainerObject && !headerContainerObject->accessibilityIsIgnored(
)) |
| 129 m_children.append(headerContainerObject); | 130 m_children.append(headerContainerObject); |
| 130 } | 131 } |
| 131 | 132 |
| 132 } // namespace blink | 133 } // namespace blink |
| OLD | NEW |