Revert of Rename AXObject to AXObjectImpl in modules/ and web/

third_party/WebKit/Source/modules/accessibility/AXARIAGrid.cpp

 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 27 matching lines @@
                        AXObjectCacheImpl& ax_object_cache)
     : AXTable(layout_object, ax_object_cache) {}
 
 AXARIAGrid::~AXARIAGrid() {}
 
 AXARIAGrid* AXARIAGrid::Create(LayoutObject* layout_object,
                                AXObjectCacheImpl& ax_object_cache) {
   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;
 
   if (appended_rows.Contains(child))
     return false;
 
   // store the maximum number of columns
   const unsigned row_cell_count = child->Children().size();
   if (row_cell_count > column_count)
     column_count = row_cell_count;
@@ skipping 21 matching lines @@
 
   if (!IsAXTable()) {
     AXLayoutObject::AddChildren();
     return;
   }
 
   have_children_ = true;
   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);
 
   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)) {
       // in case the layout tree doesn't match the expected ARIA hierarchy, look
       // at the children
       if (!child->HasChildren())
         child->AddChildren();
 
       // The children of this non-row will contain all non-ignored elements
       // (recursing to find them).  This allows the table to dive arbitrarily
       // deep to find the rows.
       for (const auto& child_object : child->Children())
         AddTableRowChild(child_object.Get(), appended_rows, column_count);
     }
   }
 
   // make the columns based on the number of columns in the first body
   for (unsigned i = 0; i < column_count; ++i) {
     AXTableColumn* column = ToAXTableColumn(ax_cache.GetOrCreate(kColumnRole));
     column->SetColumnIndex((int)i);
     column->SetParent(this);
     columns_.push_back(column);
     if (!column->AccessibilityIsIgnored())
       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);
 }
 
 }  // namespace blink