Get rid of AXScrollView and AXScrollbar

third_party/WebKit/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 23 matching lines @@
 #include "core/dom/ElementTraversal.h"
 #include "core/dom/Range.h"
 #include "core/dom/shadow/ShadowRoot.h"
 #include "core/editing/EditingUtilities.h"
 #include "core/editing/FrameSelection.h"
 #include "core/editing/RenderedPosition.h"
 #include "core/editing/TextAffinity.h"
 #include "core/editing/VisibleUnits.h"
 #include "core/editing/iterators/CharacterIterator.h"
 #include "core/editing/iterators/TextIterator.h"
+#include "core/frame/FrameOwner.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
+#include "core/html/HTMLFrameOwnerElement.h"
 #include "core/html/HTMLImageElement.h"
 #include "core/html/HTMLLabelElement.h"
 #include "core/html/HTMLOptionElement.h"
 #include "core/html/HTMLSelectElement.h"
 #include "core/html/HTMLTextAreaElement.h"
 #include "core/html/shadow/ShadowElementNames.h"
 #include "core/layout/HitTestResult.h"
 #include "core/layout/LayoutFieldset.h"
 #include "core/layout/LayoutFileUploadControl.h"
 #include "core/layout/LayoutHTMLCanvas.h"
@@ skipping 282 matching lines @@
     if (m_layoutObject)
         m_layoutObject->setHasAXObject(false);
 #endif
     m_layoutObject = 0;
 }
 
 //
 // Check object role or purpose.
 //
 
-bool AXLayoutObject::isAttachment() const
-{
-    LayoutBoxModelObject* layoutObject = layoutBoxModelObject();
-    if (!layoutObject)
-        return false;
-    // Widgets are the replaced elements that we represent to AX as attachments
-    bool isLayoutPart = layoutObject->isLayoutPart();
-    ASSERT(!isLayoutPart || (layoutObject->isAtomicInlineLevel() && !isImage()));
-    return isLayoutPart;
-}
-
 static bool isLinkable(const AXObject& object)
 {
     if (!object.layoutObject())
         return false;
 
     // See https://wiki.mozilla.org/Accessibility/AT-Windows-API for the elements
     // Mozilla considers linkable.
     return object.isLink() || object.isImage() || object.layoutObject()->isText();
 }
 
@@ skipping 198 matching lines @@
         return true;
     }
 
     // An ARIA tree can only have tree items and static text as children.
     if (AXObject* treeAncestor = treeAncestorDisallowingChild()) {
         if (ignoredReasons)
             ignoredReasons->append(IgnoredReason(AXAncestorDisallowsChild, treeAncestor));
         return true;
     }
 
-    // TODO: we should refactor this - but right now this is necessary to make
-    // sure scroll areas stay in the tree.
-    if (isAttachment())
+    // A LayoutPart is an iframe element or embedded object element or something like
+    // that. We don't want to ignore those.
+    if (m_layoutObject->isLayoutPart())
         return false;
 
     // 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
     AXObject* controlObject = correspondingControlForLabelElement();
     if (controlObject && controlObject->isCheckboxOrRadio() && controlObject->nameFromLabelElement()) {
         if (ignoredReasons) {
             HTMLLabelElement* label = labelElementContainer();
             if (label && !label->isSameNode(node())) {
                 AXObject* labelAXObject = axObjectCache().getOrCreate(label);
@@ skipping 928 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());
+    // A WebArea's parent should be the containing frame (if local) or page popup owner.
+    if (isWebArea()) {
+        LocalFrame* frame = m_layoutObject->frame();
+        if (frame->owner() && frame->owner()->isLocal()) {
+            HTMLFrameOwnerElement* owner = toHTMLFrameOwnerElement(frame->owner());
+            if (owner && owner->layoutObject())
+                return axObjectCache().getOrCreate(owner->layoutObject());
+        }
+        return axObjectCache().getOrCreate(frame->pagePopupOwner());
+    }
 
     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());
+    // A WebArea's parent should be the containing frame (if local) or page popup owner.
+    if (isWebArea()) {
+        LocalFrame* frame = m_layoutObject->frame();
+        if (frame->owner() && frame->owner()->isLocal()) {
+            HTMLFrameOwnerElement* owner = toHTMLFrameOwnerElement(frame->owner());
+            if (owner && owner->layoutObject())
+                return axObjectCache().get(owner->layoutObject());
+        }
+        return axObjectCache().get(frame->pagePopupOwner());
+    }
 
     return 0;
 }
 
 //
 // Low-level accessibility tree exploration, only for use within the accessibility module.
 //
 
 AXObject* AXLayoutObject::rawFirstChild() const
 {
@@ skipping 68 matching lines @@
     computeAriaOwnsChildren(ownedChildren);
 
     for (AXObject* obj = rawFirstChild(); obj; obj = obj->rawNextSibling()) {
         if (!axObjectCache().isAriaOwned(obj)) {
             obj->setParent(this);
             addChild(obj);
         }
     }
 
     addHiddenChildren();
-    addAttachmentChildren();
+    addFrameChildren();
     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 656 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()
+void AXLayoutObject::addFrameChildren()
 {
-    if (!isAttachment())
+    if (!m_layoutObject || !m_layoutObject->isLayoutPart())
         return;
 
-    // FrameView's need to be inserted into the AX hierarchy when encountered.
-    Widget* widget = widgetForAttachmentView();
+    Widget* widget = toLayoutPart(m_layoutObject)->widget();
     if (!widget || !widget->isFrameView())
         return;
 
-    AXObject* axWidget = axObjectCache().getOrCreate(widget);
-    if (!axWidget->accessibilityIsIgnored())
-        m_children.append(axWidget);
+    Document* doc = toFrameView(widget)->frame().document();
+    if (!doc || !doc->layoutView())
+        return;
+
+    AXObject* axChildFrame = axObjectCache().getOrCreate(doc);
+    if (!axChildFrame->accessibilityIsIgnored())
+        m_children.append(axChildFrame);
 }
 
 void AXLayoutObject::addPopupChildren()
 {
     if (!isHTMLInputElement(node()))
         return;
     if (AXObject* axPopup = toHTMLInputElement(node())->popupRootAXObject())
         m_children.append(axPopup);
 }
 
@@ skipping 65 matching lines @@
         if (label && label->layoutObject()) {
             LayoutRect labelRect = axObjectCache().getOrCreate(label)->elementRect();
             result.unite(labelRect);
         }
     }
 
     return result;
 }
 
 } // namespace blink