Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(442)

Side by Side Diff: third_party/WebKit/Source/modules/accessibility/AXARIAGrid.cpp

Issue 1477043003: Handle aria-owns and presentational children in AX name calc. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@garaventa_visibility_hidden
Patch Set: Rebase Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 if (!isAXTable()) { 87 if (!isAXTable()) {
88 AXLayoutObject::addChildren(); 88 AXLayoutObject::addChildren();
89 return; 89 return;
90 } 90 }
91 91
92 m_haveChildren = true; 92 m_haveChildren = true;
93 if (!m_layoutObject) 93 if (!m_layoutObject)
94 return; 94 return;
95 95
96 HeapVector<Member<AXObject>> children; 96 HeapVector<Member<AXObject>> children;
97 for (AXObject* child = rawFirstChild(); child; child = child->rawFirstSiblin g()) 97 for (AXObject* child = rawFirstChild(); child; child = child->rawNextSibling ())
98 children.append(child); 98 children.append(child);
99 computeAriaOwnsChildren(children); 99 computeAriaOwnsChildren(children);
100 100
101 AXObjectCacheImpl& axCache = axObjectCache(); 101 AXObjectCacheImpl& axCache = axObjectCache();
102 102
103 // Only add children that are actually rows. 103 // Only add children that are actually rows.
104 HeapHashSet<Member<AXObject>> appendedRows; 104 HeapHashSet<Member<AXObject>> appendedRows;
105 unsigned columnCount = 0; 105 unsigned columnCount = 0;
106 for (const auto& child : children) { 106 for (const auto& child : children) {
107 if (!addTableRowChild(child, appendedRows, columnCount)) { 107 if (!addTableRowChild(child, appendedRows, columnCount)) {
(...skipping 18 matching lines...) Expand all
126 if (!column->accessibilityIsIgnored()) 126 if (!column->accessibilityIsIgnored())
127 m_children.append(column); 127 m_children.append(column);
128 } 128 }
129 129
130 AXObject* headerContainerObject = headerContainer(); 130 AXObject* headerContainerObject = headerContainer();
131 if (headerContainerObject && !headerContainerObject->accessibilityIsIgnored( )) 131 if (headerContainerObject && !headerContainerObject->accessibilityIsIgnored( ))
132 m_children.append(headerContainerObject); 132 m_children.append(headerContainerObject);
133 } 133 }
134 134
135 } // namespace blink 135 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698