Get rid of AXScrollView and AXScrollbar

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

 /*
  * Copyright (C) 2014, Google 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 48 matching lines @@
 #include "modules/accessibility/AXLayoutObject.h"
 #include "modules/accessibility/AXList.h"
 #include "modules/accessibility/AXListBox.h"
 #include "modules/accessibility/AXListBoxOption.h"
 #include "modules/accessibility/AXMediaControls.h"
 #include "modules/accessibility/AXMenuList.h"
 #include "modules/accessibility/AXMenuListOption.h"
 #include "modules/accessibility/AXMenuListPopup.h"
 #include "modules/accessibility/AXProgressIndicator.h"
 #include "modules/accessibility/AXSVGRoot.h"
-#include "modules/accessibility/AXScrollView.h"
-#include "modules/accessibility/AXScrollbar.h"
 #include "modules/accessibility/AXSlider.h"
 #include "modules/accessibility/AXSpinButton.h"
 #include "modules/accessibility/AXTable.h"
 #include "modules/accessibility/AXTableCell.h"
 #include "modules/accessibility/AXTableColumn.h"
 #include "modules/accessibility/AXTableHeaderContainer.h"
 #include "modules/accessibility/AXTableRow.h"
 #include "wtf/PassRefPtr.h"
 
 namespace blink {
@@ skipping 97 matching lines @@
             obj = descendant;
     }
 
     // the HTML element, for example, is focusable but has an AX object that is ignored
     if (obj->accessibilityIsIgnored())
         obj = obj->parentObjectUnignored();
 
     return obj;
 }
 
-AXObject* AXObjectCacheImpl::get(Widget* widget)
-{
-    if (!widget)
-        return 0;
-
-    AXID axID = m_widgetObjectMapping.get(widget);
-    ASSERT(!HashTraits<AXID>::isDeletedValue(axID));
-    if (!axID)
-        return 0;
-
-    return m_objects.get(axID);
-}
-
 AXObject* AXObjectCacheImpl::get(LayoutObject* layoutObject)
 {
     if (!layoutObject)
         return 0;
 
     AXID axID = m_layoutObjectMapping.get(layoutObject);
     ASSERT(!HashTraits<AXID>::isDeletedValue(axID));
     if (!axID)
         return 0;
 
@@ skipping 134 matching lines @@
         return AXImageMapLink::create(toHTMLAreaElement(node), *this);
 
     return AXNodeObject::create(node, *this);
 }
 
 AXObject* AXObjectCacheImpl::createFromInlineTextBox(AbstractInlineTextBox* inlineTextBox)
 {
     return AXInlineTextBox::create(inlineTextBox, *this);
 }
 
-AXObject* AXObjectCacheImpl::getOrCreate(Widget* widget)
-{
-    if (!widget)
-        return 0;
-
-    if (AXObject* obj = get(widget))
-        return obj;
-
-    AXObject* newObj = nullptr;
-    if (widget->isFrameView()) {
-        FrameView* frameView = toFrameView(widget);
-
-        // Don't create an AXScrollView for a FrameView that isn't attached to a frame,
-        // for example if it's in the process of being disposed.
-        if (frameView->frame().view() != frameView || !frameView->layoutView())
-            return 0;
-
-        newObj = AXScrollView::create(toFrameView(widget), *this);
-    } else if (widget->isScrollbar()) {
-        newObj = AXScrollbar::create(toScrollbar(widget), *this);
-    }
-
-    // Will crash later if we have two objects for the same widget.
-    ASSERT(!get(widget));
-
-    // Catch the case if an (unsupported) widget type is used. Only FrameView and ScrollBar are supported now.
-    ASSERT(newObj);
-    if (!newObj)
-        return 0;
-
-    getAXID(newObj);
-
-    m_widgetObjectMapping.set(widget, newObj->axObjectID());
-    m_objects.set(newObj->axObjectID(), newObj);
-    newObj->init();
-    return newObj;
-}
-
 AXObject* AXObjectCacheImpl::getOrCreate(Node* node)
 {
     if (!node)
         return 0;
 
     if (AXObject* obj = get(node))
         return obj;
 
     // If the node has a layout object, prefer using that as the primary key for the AXObject,
     // with the exception of an HTMLAreaElement, which is created based on its node.
@@ skipping 68 matching lines @@
     newObj->setLastKnownIsIgnoredValue(newObj->accessibilityIsIgnored());
 
     return newObj;
 }
 
 AXObject* AXObjectCacheImpl::rootObject()
 {
     if (!accessibilityEnabled())
         return 0;
 
-    return getOrCreate(m_document->view());
+    return getOrCreate(m_document);
 }
 
 AXObject* AXObjectCacheImpl::getOrCreate(AccessibilityRole role)
 {
     AXObject* obj = nullptr;
 
     // will be filled in...
     switch (role) {
     case ColumnRole:
         obj = AXTableColumn::create(*this);
@@ skipping 66 matching lines @@
     AXID axID = m_nodeObjectMapping.get(node);
     remove(axID);
     m_nodeObjectMapping.remove(node);
 
     if (node->layoutObject()) {
         remove(node->layoutObject());
         return;
     }
 }
 
-void AXObjectCacheImpl::remove(Widget* view)
-{
-    if (!view)
-        return;
-
-    AXID axID = m_widgetObjectMapping.get(view);
-    remove(axID);
-    m_widgetObjectMapping.remove(view);
-}
-
 void AXObjectCacheImpl::remove(AbstractInlineTextBox* inlineTextBox)
 {
     if (!inlineTextBox)
         return;
 
     AXID axID = m_inlineTextBoxObjectMapping.get(inlineTextBox);
     remove(axID);
     m_inlineTextBoxObjectMapping.remove(inlineTextBox);
 }
 
@@ skipping 376 matching lines @@
 
 void AXObjectCacheImpl::listboxActiveIndexChanged(HTMLSelectElement* select)
 {
     AXObject* obj = get(select);
     if (!obj || !obj->isAXListBox())
         return;
 
     toAXListBox(obj)->activeIndexChanged();
 }
 
-void AXObjectCacheImpl::handleScrollbarUpdate(FrameView* view)
-{
-    if (!view)
-        return;
-
-    // We don't want to create a scroll view from this method, only update an existing one.
-    if (AXObject* scrollViewObject = get(view)) {
-        m_modificationCount++;
-        scrollViewObject->updateChildrenIfNecessary();
-    }
-}
-
 void AXObjectCacheImpl::handleLayoutComplete(LayoutObject* layoutObject)
 {
     if (!layoutObject)
         return;
 
     m_modificationCount++;
 
     // Create the AXObject if it didn't yet exist - that's always safe at the end of a layout, and it
     // allows an AX notification to be sent when a page has its first layout, rather than when the
     // document first loads.
@@ skipping 161 matching lines @@
         return false;
 
     if (!node->isElementNode())
         return false;
 
     return equalIgnoringCase(toElement(node)->getAttribute(aria_hiddenAttr), "false");
 }
 
 void AXObjectCacheImpl::postPlatformNotification(AXObject* obj, AXNotification notification)
 {
-    if (obj && obj->isAXScrollbar() && notification == AXValueChanged) {
-        // Send document value changed on scrollbar value changed notification.
-        Scrollbar* scrollBar = toAXScrollbar(obj)->scrollbar();
-        if (!scrollBar || !scrollBar->parent() || !scrollBar->parent()->isFrameView())
-            return;
-        Document* document = toFrameView(scrollBar->parent())->frame().document();
-        if (document != document->topDocument())
-            return;
-        obj = get(document->layoutView());
-    }
-
     if (!obj || !obj->document() || !obj->documentFrameView() || !obj->documentFrameView()->frame().page())
         return;
 
     ChromeClient& client = obj->document()->axObjectCacheOwner().page()->chromeClient();
 
     if (notification == AXActiveDescendantChanged
         && obj->document()->focusedElement()
         && obj->node() == obj->document()->focusedElement()) {
         // Calling handleFocusedUIElementChanged will focus the new active
         // descendant and send the AXFocusedUIElementChanged notification.
@@ skipping 84 matching lines @@
 
 void AXObjectCacheImpl::handleScrolledToAnchor(const Node* anchorNode)
 {
     // The anchor node may not be accessible. Post the notification for the
     // first accessible object.
     postPlatformNotification(firstAccessibleObjectFromNode(anchorNode), AXScrolledToAnchor);
 }
 
 void AXObjectCacheImpl::handleScrollPositionChanged(FrameView* frameView)
 {
-    // Prefer to fire the scroll position changed event on the frame view's child web area, if possible.
-    AXObject* targetAXObject = getOrCreate(frameView);
-    if (targetAXObject && !targetAXObject->children().isEmpty())
-        targetAXObject = targetAXObject->children()[0].get();
+    AXObject* targetAXObject = getOrCreate(frameView->frame().document());
     postPlatformNotification(targetAXObject, AXScrollPositionChanged);
 }
 
 void AXObjectCacheImpl::handleScrollPositionChanged(LayoutObject* layoutObject)
 {
     postPlatformNotification(getOrCreate(layoutObject), AXScrollPositionChanged);
 }
 
 const AtomicString& AXObjectCacheImpl::computedRoleForNode(Node* node)
 {
@@ skipping 25 matching lines @@
     if (!obj)
         return;
 
     obj->setElementRect(rect);
 }
 
 DEFINE_TRACE(AXObjectCacheImpl)
 {
 #if ENABLE(OILPAN)
     visitor->trace(m_document);
-    visitor->trace(m_widgetObjectMapping);
     visitor->trace(m_nodeObjectMapping);
 #endif
 
     visitor->trace(m_objects);
     visitor->trace(m_notificationsToPost);
 
     AXObjectCache::trace(visitor);
 }
 
 } // namespace blink