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

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

Index: third_party/WebKit/Source/modules/accessibility/AXLayoutObject.cpp
diff --git a/third_party/WebKit/Source/modules/accessibility/AXLayoutObject.cpp b/third_party/WebKit/Source/modules/accessibility/AXLayoutObject.cpp
index 2a1e5801392ea8b05805bb75c9747cfabd49bc50..30b7c7859f29bc744565df46be4018039747e43c 100644
--- a/third_party/WebKit/Source/modules/accessibility/AXLayoutObject.cpp
+++ b/third_party/WebKit/Source/modules/accessibility/AXLayoutObject.cpp
@@ -327,7 +327,7 @@
 // Check object role or purpose.
 //
 
-static bool IsLinkable(const AXObjectImpl& object) {
+static bool IsLinkable(const AXObject& object) {
   if (!object.GetLayoutObject())
     return false;
 
@@ -350,7 +350,7 @@
     Document& document = GetLayoutObject()->GetDocument();
     HTMLElement* body = document.body();
     if (body && HasEditableStyle(*body)) {
-      AXObjectImpl* ax_body = AxObjectCache().GetOrCreate(body);
+      AXObject* ax_body = AxObjectCache().GetOrCreate(body);
       return ax_body && ax_body != ax_body->AriaHiddenRoot();
     }
 
@@ -370,7 +370,7 @@
     Document& document = layout_object_->GetDocument();
     HTMLElement* body = document.body();
     if (body && HasRichlyEditableStyle(*body)) {
-      AXObjectImpl* ax_body = AxObjectCache().GetOrCreate(body);
+      AXObject* ax_body = AxObjectCache().GetOrCreate(body);
       return ax_body && ax_body != ax_body->AriaHiddenRoot();
     }
 
@@ -412,7 +412,7 @@
     Document& document = layout_object_->GetDocument();
     HTMLElement* body = document.body();
     if (body && HasEditableStyle(*body)) {
-      AXObjectImpl* ax_body = AxObjectCache().GetOrCreate(body);
+      AXObject* ax_body = AxObjectCache().GetOrCreate(body);
       return !ax_body || ax_body == ax_body->AriaHiddenRoot();
     }
 
@@ -441,7 +441,7 @@
   Element* focused_element = GetDocument()->FocusedElement();
   if (!focused_element)
     return false;
-  AXObjectImpl* focused_object = AxObjectCache().GetOrCreate(focused_element);
+  AXObject* focused_object = AxObjectCache().GetOrCreate(focused_element);
   if (!focused_object || !focused_object->IsAXLayoutObject())
     return false;
 
@@ -463,7 +463,7 @@
   if (EqualIgnoringASCIICase(aria_selected, "true"))
     return true;
 
-  AXObjectImpl* focused_object = AxObjectCache().FocusedObject();
+  AXObject* focused_object = AxObjectCache().FocusedObject();
   if (AriaRoleAttribute() == kListBoxOptionRole && focused_object &&
       focused_object->ActiveDescendant() == this) {
     return true;
@@ -501,7 +501,7 @@
     return kIgnoreObject;
   }
 
-  return AXObjectImpl::DefaultObjectInclusion(ignored_reasons);
+  return AXObject::DefaultObjectInclusion(ignored_reasons);
 }
 
 bool AXLayoutObject::ComputeAccessibilityIsIgnored(
@@ -542,7 +542,7 @@
 
   if (HasInheritedPresentationalRole()) {
     if (ignored_reasons) {
-      const AXObjectImpl* inherits_from = InheritsPresentationalRoleFrom();
+      const AXObject* inherits_from = InheritsPresentationalRoleFrom();
       if (inherits_from == this)
         ignored_reasons->push_back(IgnoredReason(kAXPresentationalRole));
       else
@@ -553,7 +553,7 @@
   }
 
   // An ARIA tree can only have tree items and static text as children.
-  if (AXObjectImpl* tree_ancestor = TreeAncestorDisallowingChild()) {
+  if (AXObject* tree_ancestor = TreeAncestorDisallowingChild()) {
     if (ignored_reasons)
       ignored_reasons->push_back(
           IgnoredReason(kAXAncestorDisallowsChild, tree_ancestor));
@@ -572,13 +572,13 @@
 
   // Find out if this element is inside of a label element.  If so, it may be
   // ignored because it's the label for a checkbox or radio button.
-  AXObjectImpl* control_object = CorrespondingControlForLabelElement();
+  AXObject* control_object = CorrespondingControlForLabelElement();
   if (control_object && control_object->IsCheckboxOrRadio() &&
       control_object->NameFromLabelElement()) {
     if (ignored_reasons) {
       HTMLLabelElement* label = LabelElementContainer();
       if (label && label != GetNode()) {
-        AXObjectImpl* label_ax_object = AxObjectCache().GetOrCreate(label);
+        AXObject* label_ax_object = AxObjectCache().GetOrCreate(label);
         ignored_reasons->push_back(
             IgnoredReason(kAXLabelContainer, label_ax_object));
       }
@@ -600,7 +600,7 @@
   if (layout_object_->IsText()) {
     // Static text beneath MenuItems and MenuButtons are just reported along
     // with the menu item, so it's ignored on an individual level.
-    AXObjectImpl* parent = ParentObjectUnignored();
+    AXObject* parent = ParentObjectUnignored();
     if (parent && (parent->AriaRoleAttribute() == kMenuItemRole ||
                    parent->AriaRoleAttribute() == kMenuButtonRole)) {
       if (ignored_reasons)
@@ -616,7 +616,7 @@
     }
 
     // Don't ignore static text in editable text controls.
-    for (AXObjectImpl* parent = ParentObject(); parent;
+    for (AXObject* parent = ParentObject(); parent;
          parent = parent->ParentObject()) {
       if (parent->RoleValue() == kTextFieldRole)
         return false;
@@ -809,7 +809,7 @@
   // Color::blend should be called like this: background.blend(foreground).
   for (LayoutObject* layout_object = GetLayoutObject(); layout_object;
        layout_object = layout_object->Parent()) {
-    const AXObjectImpl* ax_parent = AxObjectCache().GetOrCreate(layout_object);
+    const AXObject* ax_parent = AxObjectCache().GetOrCreate(layout_object);
     if (ax_parent && ax_parent != this) {
       Color parent_color = ax_parent->BackgroundColor();
       blended_color = parent_color.Blend(blended_color);
@@ -1080,13 +1080,13 @@
   }
 }
 
-AXObjectImpl* AXLayoutObject::NextOnLine() const {
+AXObject* AXLayoutObject::NextOnLine() const {
   if (!GetLayoutObject())
     return nullptr;
 
-  AXObjectImpl* result = nullptr;
+  AXObject* result = nullptr;
   if (GetLayoutObject()->IsListMarker()) {
-    AXObjectImpl* next_sibling = RawNextSibling();
+    AXObject* next_sibling = RawNextSibling();
     if (!next_sibling || !next_sibling->Children().size())
       return nullptr;
     result = next_sibling->Children()[0].Get();
@@ -1119,7 +1119,7 @@
   return result;
 }
 
-AXObjectImpl* AXLayoutObject::PreviousOnLine() const {
+AXObject* AXLayoutObject::PreviousOnLine() const {
   if (!GetLayoutObject())
     return nullptr;
 
@@ -1132,7 +1132,7 @@
   if (!inline_box)
     return nullptr;
 
-  AXObjectImpl* result = nullptr;
+  AXObject* result = nullptr;
   for (InlineBox* prev = inline_box->PrevOnLine(); prev;
        prev = prev->PrevOnLine()) {
     LayoutObject* layout_object =
@@ -1291,10 +1291,9 @@
   }
 }
 
-AXObjectImpl* AXLayoutObject::AncestorForWhichThisIsAPresentationalChild()
-    const {
+AXObject* AXLayoutObject::AncestorForWhichThisIsAPresentationalChild() const {
   // Walk the parent chain looking for a parent that has presentational children
-  AXObjectImpl* parent = ParentObjectIfExists();
+  AXObject* parent = ParentObjectIfExists();
   while (parent) {
     if (parent->AriaRoleHasPresentationalChildren())
       break;
@@ -1398,8 +1397,7 @@
 // Hit testing.
 //
 
-AXObjectImpl* AXLayoutObject::AccessibilityHitTest(
-    const IntPoint& point) const {
+AXObject* AXLayoutObject::AccessibilityHitTest(const IntPoint& point) const {
   if (!layout_object_ || !layout_object_->HasLayer())
     return nullptr;
 
@@ -1426,7 +1424,7 @@
   if (!obj)
     return nullptr;
 
-  AXObjectImpl* result = AxObjectCache().GetOrCreate(obj);
+  AXObject* result = AxObjectCache().GetOrCreate(obj);
   result->UpdateChildrenIfNecessary();
 
   // Allow the element to perform any hit-testing it might need to do to reach
@@ -1436,7 +1434,7 @@
     // If this element is the label of a control, a hit test should return the
     // control.
     if (result->IsAXLayoutObject()) {
-      AXObjectImpl* control_object =
+      AXObject* control_object =
           ToAXLayoutObject(result)->CorrespondingControlForLabelElement();
       if (control_object && control_object->NameFromLabelElement())
         return control_object;
@@ -1448,19 +1446,19 @@
   return result;
 }
 
-AXObjectImpl* AXLayoutObject::ElementAccessibilityHitTest(
+AXObject* AXLayoutObject::ElementAccessibilityHitTest(
     const IntPoint& point) const {
   if (IsSVGImage())
     return RemoteSVGElementHitTest(point);
 
-  return AXObjectImpl::ElementAccessibilityHitTest(point);
+  return AXObject::ElementAccessibilityHitTest(point);
 }
 
 //
 // High-level accessibility tree access.
 //
 
-AXObjectImpl* AXLayoutObject::ComputeParent() const {
+AXObject* AXLayoutObject::ComputeParent() const {
   DCHECK(!IsDetached());
   if (!layout_object_)
     return 0;
@@ -1471,7 +1469,7 @@
   // menuButton and its corresponding menu are DOM siblings, but Accessibility
   // needs them to be parent/child.
   if (AriaRoleAttribute() == kMenuRole) {
-    AXObjectImpl* parent = MenuButtonForMenu();
+    AXObject* parent = MenuButtonForMenu();
     if (parent)
       return parent;
   }
@@ -1489,7 +1487,7 @@
   return 0;
 }
 
-AXObjectImpl* AXLayoutObject::ComputeParentIfExists() const {
+AXObject* AXLayoutObject::ComputeParentIfExists() const {
   if (!layout_object_)
     return 0;
 
@@ -1499,7 +1497,7 @@
   // menuButton and its corresponding menu are DOM siblings, but Accessibility
   // needs them to be parent/child.
   if (AriaRoleAttribute() == kMenuRole) {
-    AXObjectImpl* parent = MenuButtonForMenu();
+    AXObject* parent = MenuButtonForMenu();
     if (parent)
       return parent;
   }
@@ -1522,7 +1520,7 @@
 // accessibility module.
 //
 
-AXObjectImpl* AXLayoutObject::RawFirstChild() const {
+AXObject* AXLayoutObject::RawFirstChild() const {
   if (!layout_object_)
     return 0;
 
@@ -1534,7 +1532,7 @@
   return AxObjectCache().GetOrCreate(first_child);
 }
 
-AXObjectImpl* AXLayoutObject::RawNextSibling() const {
+AXObject* AXLayoutObject::RawNextSibling() const {
   if (!layout_object_)
     return 0;
 
@@ -1602,10 +1600,10 @@
   if (!CanHaveChildren())
     return;
 
-  HeapVector<Member<AXObjectImpl>> owned_children;
+  HeapVector<Member<AXObject>> owned_children;
   ComputeAriaOwnsChildren(owned_children);
 
-  for (AXObjectImpl* obj = RawFirstChild(); obj; obj = obj->RawNextSibling()) {
+  for (AXObject* obj = RawFirstChild(); obj; obj = obj->RawNextSibling()) {
     if (!AxObjectCache().IsAriaOwned(obj)) {
       obj->SetParent(this);
       AddChild(obj);
@@ -1640,11 +1638,11 @@
   if (NeedsToUpdateChildren())
     ClearChildren();
 
-  AXObjectImpl::UpdateChildrenIfNecessary();
+  AXObject::UpdateChildrenIfNecessary();
 }
 
 void AXLayoutObject::ClearChildren() {
-  AXObjectImpl::ClearChildren();
+  AXObject::ClearChildren();
   children_dirty_ = false;
 }
 
@@ -1731,7 +1729,7 @@
 // Functions that retrieve the current selection.
 //
 
-AXObjectImpl::AXRange AXLayoutObject::Selection() const {
+AXObject::AXRange AXLayoutObject::Selection() const {
   AXRange text_selection = TextControlSelection();
   if (text_selection.IsValid())
     return text_selection;
@@ -1758,7 +1756,7 @@
   DCHECK(anchor_node);
 
   AXLayoutObject* anchor_object = nullptr;
-  // Find the closest node that has a corresponding AXObjectImpl.
+  // Find the closest node that has a corresponding AXObject.
   // This is because some nodes may be aria hidden or might not even have
   // a layout object if they are part of the shadow DOM.
   while (anchor_node) {
@@ -1801,7 +1799,7 @@
 // Gets only the start and end offsets of the selection computed using the
 // current object as the starting point. Returns a null selection if there is
 // no selection in the subtree rooted at this object.
-AXObjectImpl::AXRange AXLayoutObject::SelectionUnderObject() const {
+AXObject::AXRange AXLayoutObject::SelectionUnderObject() const {
   AXRange text_selection = TextControlSelection();
   if (text_selection.IsValid())
     return text_selection;
@@ -1835,7 +1833,7 @@
   return AXRange(start, end);
 }
 
-AXObjectImpl::AXRange AXLayoutObject::TextControlSelection() const {
+AXObject::AXRange AXLayoutObject::TextControlSelection() const {
   if (!GetLayoutObject())
     return AXRange();
 
@@ -1852,7 +1850,7 @@
   if (!layout)
     return AXRange();
 
-  AXObjectImpl* ax_object = AxObjectCache().GetOrCreate(layout);
+  AXObject* ax_object = AxObjectCache().GetOrCreate(layout);
   if (!ax_object || !ax_object->IsAXLayoutObject())
     return AXRange();
 
@@ -1897,7 +1895,7 @@
   if (IsDetached())
     return nullptr;
 
-  AXObjectImpl* ax_object = AxObjectCache().GetOrCreate(&node);
+  AXObject* ax_object = AxObjectCache().GetOrCreate(&node);
   if (!ax_object)
     return nullptr;
 
@@ -1912,7 +1910,7 @@
 //
 
 // Convert from an accessible object and offset to a VisiblePosition.
-static VisiblePosition ToVisiblePosition(AXObjectImpl* obj, int offset) {
+static VisiblePosition ToVisiblePosition(AXObject* obj, int offset) {
   if (!obj->GetNode())
     return VisiblePosition();
 
@@ -1938,7 +1936,7 @@
         static_cast<unsigned>(offset) > (obj->Children().size() - 1)
             ? offset - 1
             : offset;
-    AXObjectImpl* child_obj = obj->Children()[clamped_offset];
+    AXObject* child_obj = obj->Children()[clamped_offset];
     Node* child_node = child_obj->GetNode();
     if (!child_node || !child_node->parentNode())
       return VisiblePosition();
@@ -1971,9 +1969,9 @@
   if (!GetLayoutObject() || !selection.IsValid())
     return;
 
-  AXObjectImpl* anchor_object =
+  AXObject* anchor_object =
       selection.anchor_object ? selection.anchor_object.Get() : this;
-  AXObjectImpl* focus_object =
+  AXObject* focus_object =
       selection.focus_object ? selection.focus_object.Get() : this;
 
   if (!IsValidSelectionBound(anchor_object) ||
@@ -2025,8 +2023,7 @@
           .Build());
 }
 
-bool AXLayoutObject::IsValidSelectionBound(
-    const AXObjectImpl* bound_object) const {
+bool AXLayoutObject::IsValidSelectionBound(const AXObject* bound_object) const {
   return GetLayoutObject() && bound_object && !bound_object->IsDetached() &&
          bound_object->IsAXLayoutObject() && bound_object->GetLayoutObject() &&
          bound_object->GetLayoutObject()->GetFrame() ==
@@ -2057,7 +2054,7 @@
   if (!GetLayoutObject())
     return;
 
-  AXObjectImpl* focused_object = AxObjectCache().FocusedObject();
+  AXObject* focused_object = AxObjectCache().FocusedObject();
   if (focused_object == this && SupportsActiveDescendant()) {
     AxObjectCache().PostNotification(
         GetLayoutObject(), AXObjectCacheImpl::kAXActiveDescendantChanged);
@@ -2066,7 +2063,7 @@
 
 void AXLayoutObject::HandleAriaExpandedChanged() {
   // Find if a parent of this object should handle aria-expanded changes.
-  AXObjectImpl* container_parent = this->ParentObject();
+  AXObject* container_parent = this->ParentObject();
   while (container_parent) {
     bool found_parent = false;
 
@@ -2186,7 +2183,7 @@
   for (RefPtr<AbstractInlineTextBox> box =
            layout_text->FirstAbstractInlineTextBox();
        box.Get(); box = box->NextInlineTextBox()) {
-    AXObjectImpl* ax_object = AxObjectCache().GetOrCreate(box.Get());
+    AXObject* ax_object = AxObjectCache().GetOrCreate(box.Get());
     if (!ax_object->AccessibilityIsIgnored())
       children_.push_back(ax_object);
   }
@@ -2219,11 +2216,11 @@
 // Private.
 //
 
-AXObjectImpl* AXLayoutObject::TreeAncestorDisallowingChild() const {
+AXObject* AXLayoutObject::TreeAncestorDisallowingChild() const {
   // Determine if this is in a tree. If so, we apply special behavior to make it
   // work like an AXOutline.
-  AXObjectImpl* ax_obj = ParentObject();
-  AXObjectImpl* tree_ancestor = 0;
+  AXObject* ax_obj = ParentObject();
+  AXObject* tree_ancestor = 0;
   while (ax_obj) {
     if (ax_obj->IsTree()) {
       tree_ancestor = ax_obj;
@@ -2253,7 +2250,7 @@
   // The ARIA spec says a tab item can also be selected if it is aria-labeled by
   // a tabpanel that has keyboard focus inside of it, or if a tabpanel in its
   // aria-controls list has KB focus inside of it.
-  AXObjectImpl* focused_element = AxObjectCache().FocusedObject();
+  AXObject* focused_element = AxObjectCache().FocusedObject();
   if (!focused_element)
     return false;
 
@@ -2261,13 +2258,13 @@
   ElementsFromAttribute(elements, aria_controlsAttr);
 
   for (const auto& element : elements) {
-    AXObjectImpl* tab_panel = AxObjectCache().GetOrCreate(element);
+    AXObject* tab_panel = AxObjectCache().GetOrCreate(element);
 
     // A tab item should only control tab panels.
     if (!tab_panel || tab_panel->RoleValue() != kTabPanelRole)
       continue;
 
-    AXObjectImpl* check_focus_element = focused_element;
+    AXObject* check_focus_element = focused_element;
     // Check if the focused element is a descendant of the element controlled by
     // the tab item.
     while (check_focus_element) {
@@ -2280,13 +2277,13 @@
   return false;
 }
 
-AXObjectImpl* AXLayoutObject::AccessibilityImageMapHitTest(
+AXObject* AXLayoutObject::AccessibilityImageMapHitTest(
     HTMLAreaElement* area,
     const IntPoint& point) const {
   if (!area)
     return 0;
 
-  AXObjectImpl* parent = AxObjectCache().GetOrCreate(area->ImageElement());
+  AXObject* parent = AxObjectCache().GetOrCreate(area->ImageElement());
   if (!parent)
     return 0;
 
@@ -2364,9 +2361,8 @@
   return 0;
 }
 
-AXObjectImpl* AXLayoutObject::RemoteSVGElementHitTest(
-    const IntPoint& point) const {
-  AXObjectImpl* remote = RemoteSVGRootElement();
+AXObject* AXLayoutObject::RemoteSVGElementHitTest(const IntPoint& point) const {
+  AXObject* remote = RemoteSVGRootElement();
   if (!remote)
     return 0;
 
@@ -2380,7 +2376,7 @@
 // coordinates only.
 void AXLayoutObject::OffsetBoundingBoxForRemoteSVGElement(
     LayoutRect& rect) const {
-  for (AXObjectImpl* parent = ParentObject(); parent;
+  for (AXObject* parent = ParentObject(); parent;
        parent = parent->ParentObject()) {
     if (parent->IsAXSVGRoot()) {
       rect.MoveBy(
@@ -2419,7 +2415,7 @@
   for (Node& child : NodeTraversal::ChildrenOf(*node)) {
     if (child.GetLayoutObject()) {
       // Find out where the last layout sibling is located within m_children.
-      if (AXObjectImpl* child_object =
+      if (AXObject* child_object =
               AxObjectCache().Get(child.GetLayoutObject())) {
         if (child_object->AccessibilityIsIgnored()) {
           const auto& children = child_object->Children();
@@ -2474,7 +2470,7 @@
   for (HTMLAreaElement& area :
        Traversal<HTMLAreaElement>::DescendantsOf(*map)) {
     // add an <area> element for this child if it has a link
-    AXObjectImpl* obj = AxObjectCache().GetOrCreate(&area);
+    AXObject* obj = AxObjectCache().GetOrCreate(&area);
     if (obj) {
       AXImageMapLink* area_object = ToAXImageMapLink(obj);
       area_object->SetParent(this);
@@ -2502,8 +2498,7 @@
 void AXLayoutObject::AddPopupChildren() {
   if (!isHTMLInputElement(GetNode()))
     return;
-  if (AXObjectImpl* ax_popup =
-          toHTMLInputElement(GetNode())->PopupRootAXObject())
+  if (AXObject* ax_popup = toHTMLInputElement(GetNode())->PopupRootAXObject())
     children_.push_back(ax_popup);
 }