Expose InlineTextBoxes in the accessibility tree.

Source/core/accessibility/AccessibilityRenderObject.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 14 matching lines @@
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include "config.h"
 #include "core/accessibility/AccessibilityRenderObject.h"
 
 #include "bindings/v8/ExceptionStatePlaceholder.h"
 #include "core/accessibility/AXObjectCache.h"
 #include "core/accessibility/AccessibilityImageMapLink.h"
+#include "core/accessibility/AccessibilityInlineTextBox.h"
 #include "core/accessibility/AccessibilitySVGRoot.h"
 #include "core/accessibility/AccessibilitySpinButton.h"
 #include "core/accessibility/AccessibilityTable.h"
 #include "core/dom/ElementTraversal.h"
 #include "core/dom/shadow/ShadowRoot.h"
 #include "core/editing/FrameSelection.h"
 #include "core/editing/RenderedPosition.h"
 #include "core/editing/VisibleUnits.h"
 #include "core/editing/htmlediting.h"
 #include "core/frame/Frame.h"
 #include "core/html/HTMLHtmlElement.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/loader/ProgressTracker.h"
 #include "core/page/Page.h"
 #include "core/rendering/HitTestResult.h"
+#include "core/rendering/RenderFieldset.h"
 #include "core/rendering/RenderFileUploadControl.h"
 #include "core/rendering/RenderHTMLCanvas.h"
 #include "core/rendering/RenderImage.h"
 #include "core/rendering/RenderInline.h"
 #include "core/rendering/RenderLayer.h"
 #include "core/rendering/RenderListMarker.h"
 #include "core/rendering/RenderMenuList.h"
 #include "core/rendering/RenderTextControlSingleLine.h"
 #include "core/rendering/RenderTextFragment.h"
 #include "core/rendering/RenderView.h"
@@ skipping 1400 matching lines @@
 
     for (RefPtr<AccessibilityObject> obj = firstChild(); obj; obj = obj->nextSibling())
         addChild(obj.get());
 
     addHiddenChildren();
     addAttachmentChildren();
     addImageMapChildren();
     addTextFieldChildren();
     addCanvasChildren();
     addRemoteSVGChildren();
+    addInlineTextBoxChildren();
 }
 
 bool AccessibilityRenderObject::canHaveChildren() const
 {
     if (!m_renderer)
         return false;
 
     return AccessibilityNodeObject::canHaveChildren();
 }
 
@@ skipping 243 matching lines @@
 
     // Post that the row count changed.
     if (containerParent)
         axObjectCache()->postNotification(containerParent, document(), AXObjectCache::AXRowCountChanged, true);
 
     // Post that the specific row either collapsed or expanded.
     if (roleValue() == RowRole || roleValue() == TreeItemRole)
         axObjectCache()->postNotification(this, document(), isExpanded() ? AXObjectCache::AXRowExpanded : AXObjectCache::AXRowCollapsed, true);
 }
 
+void AccessibilityRenderObject::textChanged()
+{
+    if (!m_renderer)
+        return;
+
+    if (AXObjectCache::inlineTextBoxAccessibility() && roleValue() == StaticTextRole)
+        childrenChanged();
+
+    AccessibilityNodeObject::textChanged();

[aboxhall, 2013/10/17 22:27:55]

Why does this come last?

[dmazzoni, 2013/10/19 06:48:07]

AccessibilityNodeObject::textChanged handles live region announcements. We
should update the tree before sending live region events.

Added a comment.

+}
+
 //
 // Text metrics. Most of these should be deprecated, needs major cleanup.
 //
 
 // NOTE: Consider providing this utility method as AX API
 int AccessibilityRenderObject::index(const VisiblePosition& position) const
 {
     if (position.isNull() || !isTextControl())
         return -1;
 
@@ skipping 47 matching lines @@
     if (indexPosition.isNull() || highestEditableRoot(indexPosition, HasEditableAXRole) != node)
         return 0;
 
     RefPtr<Range> range = Range::create(m_renderer->document());
     range->setStart(node, 0, IGNORE_EXCEPTION);
     range->setEnd(indexPosition, IGNORE_EXCEPTION);
 
     return TextIterator::rangeLength(range.get());
 }
 
+void AccessibilityRenderObject::addInlineTextBoxChildren()
+{
+    if (!axObjectCache()->inlineTextBoxAccessibility())
+        return;
+
+    if (!renderer() || !renderer()->isText())
+        return;
+
+    RenderText* renderText = toRenderText(renderer());
+    if (renderText->needsLayout())
+        renderText->document().updateLayoutIgnorePendingStylesheets();
+
+    for (RefPtr<AbstractInlineTextBox> box = renderText->firstAbstractInlineTextBox(); box.get(); box = box->nextInlineTextBox()) {
+        AccessibilityObject* axObject = axObjectCache()->getOrCreate(box.get());
+        if (!axObject->accessibilityIsIgnored())
+            m_children.append(axObject);
+    }
+}
+
 void AccessibilityRenderObject::lineBreaks(Vector<int>& lineBreaks) const
 {
     if (!isTextControl())
         return;
 
     VisiblePosition visiblePos = visiblePositionForIndex(0);
     VisiblePosition savedVisiblePos = visiblePos;
     visiblePos = nextLinePosition(visiblePos, 0);
     while (!visiblePos.isNull() && visiblePos != savedVisiblePos) {
         lineBreaks.append(indexForVisiblePosition(visiblePos));
@@ skipping 560 matching lines @@
         if (label && label->renderer()) {
             LayoutRect labelRect = axObjectCache()->getOrCreate(label)->elementRect();
             result.unite(labelRect);
         }
     }
 
     return result;
 }
 
 } // namespace WebCore