Get rid of AXScrollView and AXScrollbar

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

 /*
  * Copyright (C) 2008, 2009, 2011 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 1091 matching lines @@
             if (obj->style()->hasAppearance())
                 LayoutTheme::theme().addVisualOverflow(*obj, r);
             result.unite(r);
         }
     }
     return result;
 }
 
 AXObject* AXObject::elementAccessibilityHitTest(const IntPoint& point) const
 {
-    // Send the hit test back into the sub-frame if necessary.
-    if (isAttachment()) {
-        Widget* widget = widgetForAttachmentView();
-        // Normalize the point for the widget's bounds.
-        if (widget && widget->isFrameView())
-            return axObjectCache().getOrCreate(widget)->accessibilityHitTest(IntPoint(point - widget->frameRect().location()));
-    }
-
-    // Check if there are any mock elements that need to be handled.
+    // Check if there are any mock elements or child frames that need to be handled.
     for (const auto& child : m_children) {
         if (child->isMockObject() && child->elementRect().contains(point))
             return child->elementAccessibilityHitTest(point);
+
+        if (child->isWebArea()) {
+            FrameView* frameView = child->documentFrameView();
+            if (frameView)
+                return child->accessibilityHitTest(IntPoint(point - frameView->frameRect().location()));
+        }
     }
 
     return const_cast<AXObject*>(this);
 }
 
 const AXObject::AXObjectVector& AXObject::children()
 {
     updateChildrenIfNecessary();
 
     return m_children;
@@ skipping 286 matching lines @@
     return (objectMin + objectMax - viewportMin - viewportMax) / 2;
 }
 
 void AXObject::scrollToMakeVisibleWithSubFocus(const IntRect& subfocus) const
 {
     // Search up the parent chain until we find the first one that's scrollable.
     AXObject* scrollParent = parentObject();
     ScrollableArea* scrollableArea = 0;
     while (scrollParent) {
         scrollableArea = scrollParent->getScrollableAreaIfScrollable();
-        if (scrollableArea && !scrollParent->isAXScrollView())
+        if (scrollableArea)
             break;
         scrollParent = scrollParent->parentObject();
     }
     if (!scrollParent || !scrollableArea)
         return;
 
     IntRect objectRect = pixelSnappedIntRect(elementRect());
     IntPoint scrollPosition = scrollableArea->scrollPosition();
     IntRect scrollVisibleRect = scrollableArea->visibleContentRect();
 
@@ skipping 28 matching lines @@
         scrollParent->scrollToMakeVisibleWithSubFocus(newSubfocus);
 }
 
 void AXObject::scrollToGlobalPoint(const IntPoint& globalPoint) const
 {
     // Search up the parent chain and create a vector of all scrollable parent objects
     // and ending with this object itself.
     HeapVector<Member<const AXObject>> objects;
     AXObject* parentObject;
     for (parentObject = this->parentObject(); parentObject; parentObject = parentObject->parentObject()) {
-        if (parentObject->getScrollableAreaIfScrollable() && !parentObject->isAXScrollView())
+        if (parentObject->getScrollableAreaIfScrollable())
             objects.prepend(parentObject);
     }
     objects.append(this);
 
     // Start with the outermost scrollable (the main window) and try to scroll the
     // next innermost object to the given point.
     int offsetX = 0, offsetY = 0;
     IntPoint point = globalPoint;
     size_t levels = objects.size() - 1;
     for (size_t i = 0; i < levels; i++) {
@@ skipping 212 matching lines @@
 
 DEFINE_TRACE(AXObject)
 {
     visitor->trace(m_children);
     visitor->trace(m_parent);
     visitor->trace(m_cachedLiveRegionRoot);
     visitor->trace(m_axObjectCache);
 }
 
 } // namespace blink