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

Unified Diff: third_party/WebKit/Source/modules/accessibility/AXARIAGrid.cpp

Issue 2883203002: Revert of Rename AXObject to AXObjectImpl in modules/ and web/ (Closed)
Patch Set: Created 3 years, 7 months 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 side-by-side diff with in-line comments
Download patch
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 b0f9208bb4569d46c0071250ec256b7eaf58dfd1..4bb9d3daff3cf14ef3768afce36fcb0922aa2bd5 100644
--- a/third_party/WebKit/Source/modules/accessibility/AXARIAGrid.cpp
+++ b/third_party/WebKit/Source/modules/accessibility/AXARIAGrid.cpp
@@ -45,10 +45,9 @@
return new AXARIAGrid(layout_object, ax_object_cache);
}
-bool AXARIAGrid::AddTableRowChild(
- AXObjectImpl* child,
- HeapHashSet<Member<AXObjectImpl>>& appended_rows,
- unsigned& column_count) {
+bool AXARIAGrid::AddTableRowChild(AXObject* child,
+ HeapHashSet<Member<AXObject>>& appended_rows,
+ unsigned& column_count) {
if (!child || child->RoleValue() != kRowRole)
return false;
@@ -90,8 +89,8 @@
if (!layout_object_)
return;
- HeapVector<Member<AXObjectImpl>> children;
- for (AXObjectImpl* child = RawFirstChild(); child;
+ HeapVector<Member<AXObject>> children;
+ for (AXObject* child = RawFirstChild(); child;
child = child->RawNextSibling())
children.push_back(child);
ComputeAriaOwnsChildren(children);
@@ -99,7 +98,7 @@
AXObjectCacheImpl& ax_cache = AxObjectCache();
// Only add children that are actually rows.
- HeapHashSet<Member<AXObjectImpl>> appended_rows;
+ HeapHashSet<Member<AXObject>> appended_rows;
unsigned column_count = 0;
for (const auto& child : children) {
if (!AddTableRowChild(child, appended_rows, column_count)) {
@@ -126,7 +125,7 @@
children_.push_back(column);
}
- AXObjectImpl* header_container_object = HeaderContainer();
+ AXObject* header_container_object = HeaderContainer();
if (header_container_object &&
!header_container_object->AccessibilityIsIgnored())
children_.push_back(header_container_object);

Powered by Google App Engine
This is Rietveld 408576698