One AXObjectCache per frame

Source/modules/accessibility/AXLayoutObject.cpp

 /*
 * Copyright (C) 2008 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 229 matching lines @@
     // We want to notify that the combo box has changed its active descendant,
     // but we do not want to change the focus, because focus should remain with the combo box.
     if (isComboBox())
         return true;
 
     return shouldFocusActiveDescendant();
 }
 
 ScrollableArea* AXLayoutObject::getScrollableAreaIfScrollable() const
 {
-    // FIXME(dmazzoni): the plan is to get rid of AXScrollView, but until
-    // this is done, a WebArea delegates its scrolling to its parent scroll view.
-    // http://crbug.com/484878
-    if (parentObject() && parentObject()->isAXScrollView())
-        return parentObject()->getScrollableAreaIfScrollable();
+    if (isWebArea())
+        return documentFrameView();
 
     if (!m_layoutObject || !m_layoutObject->isBox())
         return 0;
 
     LayoutBox* box = toLayoutBox(m_layoutObject);
     if (!box->canBeScrolledAndHasScrollableArea())
         return 0;
 
     return box->scrollableArea();
 }
@@ skipping 1330 matching lines @@
     if (ariaRoleAttribute() == MenuRole) {
         AXObject* parent = menuButtonForMenu();
         if (parent)
             return parent;
     }
 
     LayoutObject* parentObj = layoutParentObject();
     if (parentObj)
         return axObjectCache().getOrCreate(parentObj);
 
-    // WebArea's parent should be the scroll view containing it.
-    if (isWebArea())
-        return axObjectCache().getOrCreate(m_layoutObject->frame()->view());
-
     return 0;
 }
 
 AXObject* AXLayoutObject::computeParentIfExists() const
 {
     if (!m_layoutObject)
         return 0;
 
     if (ariaRoleAttribute() == MenuBarRole)
         return axObjectCache().get(m_layoutObject->parent());
 
     // menuButton and its corresponding menu are DOM siblings, but Accessibility needs them to be parent/child
     if (ariaRoleAttribute() == MenuRole) {
         AXObject* parent = menuButtonForMenu();
         if (parent)
             return parent;
     }
 
     LayoutObject* parentObj = layoutParentObject();
     if (parentObj)
         return axObjectCache().get(parentObj);
 
-    // WebArea's parent should be the scroll view containing it.
-    if (isWebArea())
-        return axObjectCache().get(m_layoutObject->frame()->view());
-
     return 0;
 }
 
 //
 // Low-level accessibility tree exploration, only for use within the accessibility module.
 //
 
 AXObject* AXLayoutObject::firstChild() const
 {
     if (!m_layoutObject)
@@ skipping 64 matching lines @@
 
     HeapVector<Member<AXObject>> ownedChildren;
     computeAriaOwnsChildren(ownedChildren);
 
     for (AXObject* obj = firstChild(); obj; obj = obj->nextSibling()) {
         if (!axObjectCache().isAriaOwned(obj))
             addChild(obj);
     }
 
     addHiddenChildren();
-    addAttachmentChildren();
     addPopupChildren();
     addImageMapChildren();
     addTextFieldChildren();
     addCanvasChildren();
     addRemoteSVGChildren();
     addInlineTextBoxChildren(false);
 
     for (const auto& child : m_children) {
         if (!child->cachedParentObject())
             child->setParent(this);
@@ skipping 92 matching lines @@
     // NOTE: this assumes that any non-image with an anchor is an HTMLAnchorElement
     Node* node = currLayoutObject->node();
     for ( ; node; node = node->parentNode()) {
         if (isHTMLAnchorElement(*node) || (node->layoutObject() && cache.getOrCreate(node->layoutObject())->isAnchor()))
             return toElement(node);
     }
 
     return 0;
 }
 
-Widget* AXLayoutObject::widgetForAttachmentView() const
-{
-    if (!isAttachment())
-        return 0;
-    return toLayoutPart(m_layoutObject)->widget();
-}
-
 //
 // Functions that retrieve the current selection.
 //
 
 AXObject::AXRange AXLayoutObject::selection() const
 {
     AXRange textSelection = textControlSelection();
     if (textSelection.isValid())
         return textSelection;
 
@@ skipping 452 matching lines @@
     if (!isTabItem() || !m_layoutObject)
         return false;
 
     Node* node = m_layoutObject->node();
     if (!node || !node->isElementNode())
         return false;
 
     // 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.
-    AXObject* focusedElement = focusedUIElement();
+    Document* doc = document();
+    if (!doc)
+        return false;
+
+    Element* focusedElement = doc->activeElement();
     if (!focusedElement)
         return false;
 
     WillBeHeapVector<RawPtrWillBeMember<Element>> elements;
     elementsFromAttribute(elements, aria_controlsAttr);
 
     for (const auto& element : elements) {
         AXObject* tabPanel = axObjectCache().getOrCreate(element);
 
         // A tab item should only control tab panels.
         if (!tabPanel || tabPanel->roleValue() != TabPanelRole)
             continue;
 
-        AXObject* checkFocusElement = focusedElement;
+        Element* checkFocusElement = focusedElement;
         // Check if the focused element is a descendant of the element controlled by the tab item.
         while (checkFocusElement) {
-            if (tabPanel == checkFocusElement)
+            if (tabPanel->node() == checkFocusElement)
                 return true;
-            checkFocusElement = checkFocusElement->parentObject();
+            checkFocusElement = checkFocusElement->parentElement();
         }
     }
 
     return false;
 }
 
 AXObject* AXLayoutObject::accessibilityImageMapHitTest(HTMLAreaElement* area, const IntPoint& point) const
 {
     if (!area)
         return 0;
@@ skipping 191 matching lines @@
     if (!isHTMLCanvasElement(node()))
         return;
 
     // If it's a canvas, it won't have laid out children, but it might have accessible fallback content.
     // Clear m_haveChildren because AXNodeObject::addChildren will expect it to be false.
     ASSERT(!m_children.size());
     m_haveChildren = false;
     AXNodeObject::addChildren();
 }
 
-void AXLayoutObject::addAttachmentChildren()
-{
-    if (!isAttachment())
-        return;
-
-    // FrameView's need to be inserted into the AX hierarchy when encountered.
-    Widget* widget = widgetForAttachmentView();
-    if (!widget || !widget->isFrameView())
-        return;
-
-    AXObject* axWidget = axObjectCache().getOrCreate(widget);
-    if (!axWidget->accessibilityIsIgnored())
-        m_children.append(axWidget);
-}
-
 void AXLayoutObject::addPopupChildren()
 {
     if (!isHTMLInputElement(node()))
         return;
     if (AXObject* axPopup = toHTMLInputElement(node())->popupRootAXObject())
         m_children.append(axPopup);
 }
 
 void AXLayoutObject::addRemoteSVGChildren()
 {
@@ skipping 92 matching lines @@
         if (label && label->layoutObject()) {
             LayoutRect labelRect = axObjectCache().getOrCreate(label)->elementRect();
             result.unite(labelRect);
         }
     }
 
     return result;
 }
 
 } // namespace blink