| Index: third_party/WebKit/Source/modules/accessibility/AXARIAGrid.cpp
|
| diff --git a/third_party/WebKit/Source/modules/accessibility/AXARIAGrid.cpp b/third_party/WebKit/Source/modules/accessibility/AXARIAGrid.cpp
|
| index 4bb9d3daff3cf14ef3768afce36fcb0922aa2bd5..b0f9208bb4569d46c0071250ec256b7eaf58dfd1 100644
|
| --- a/third_party/WebKit/Source/modules/accessibility/AXARIAGrid.cpp
|
| +++ b/third_party/WebKit/Source/modules/accessibility/AXARIAGrid.cpp
|
| @@ -45,9 +45,10 @@ AXARIAGrid* AXARIAGrid::Create(LayoutObject* layout_object,
|
| return new AXARIAGrid(layout_object, ax_object_cache);
|
| }
|
|
|
| -bool AXARIAGrid::AddTableRowChild(AXObject* child,
|
| - HeapHashSet<Member<AXObject>>& appended_rows,
|
| - unsigned& column_count) {
|
| +bool AXARIAGrid::AddTableRowChild(
|
| + AXObjectImpl* child,
|
| + HeapHashSet<Member<AXObjectImpl>>& appended_rows,
|
| + unsigned& column_count) {
|
| if (!child || child->RoleValue() != kRowRole)
|
| return false;
|
|
|
| @@ -89,8 +90,8 @@ void AXARIAGrid::AddChildren() {
|
| if (!layout_object_)
|
| return;
|
|
|
| - HeapVector<Member<AXObject>> children;
|
| - for (AXObject* child = RawFirstChild(); child;
|
| + HeapVector<Member<AXObjectImpl>> children;
|
| + for (AXObjectImpl* child = RawFirstChild(); child;
|
| child = child->RawNextSibling())
|
| children.push_back(child);
|
| ComputeAriaOwnsChildren(children);
|
| @@ -98,7 +99,7 @@ void AXARIAGrid::AddChildren() {
|
| AXObjectCacheImpl& ax_cache = AxObjectCache();
|
|
|
| // Only add children that are actually rows.
|
| - HeapHashSet<Member<AXObject>> appended_rows;
|
| + HeapHashSet<Member<AXObjectImpl>> appended_rows;
|
| unsigned column_count = 0;
|
| for (const auto& child : children) {
|
| if (!AddTableRowChild(child, appended_rows, column_count)) {
|
| @@ -125,7 +126,7 @@ void AXARIAGrid::AddChildren() {
|
| children_.push_back(column);
|
| }
|
|
|
| - AXObject* header_container_object = HeaderContainer();
|
| + AXObjectImpl* header_container_object = HeaderContainer();
|
| if (header_container_object &&
|
| !header_container_object->AccessibilityIsIgnored())
|
| children_.push_back(header_container_object);
|
|
|