Reland: Made content editables report the caret and text selection by treating them as text controls

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 1572 matching lines @@
 
 //
 // Selected text.
 //
 
 AXObject::PlainTextRange AXLayoutObject::selectedTextRange() const
 {
     if (!isTextControl())
         return PlainTextRange();
 
-    AccessibilityRole ariaRole = ariaRoleAttribute();
-    if (isNativeTextControl() && ariaRole == UnknownRole && m_layoutObject->isTextControl()) {
+    if (m_layoutObject->isTextControl()) {
         HTMLTextFormControlElement* textControl = toLayoutTextControl(m_layoutObject)->textFormControlElement();
         return PlainTextRange(textControl->selectionStart(), textControl->selectionEnd() - textControl->selectionStart());
     }
 
-    if (ariaRole == UnknownRole)
-        return PlainTextRange();
-
-    return ariaSelectedTextRange();
+    return visibleSelectionUnderObject();
 }
 
 VisibleSelection AXLayoutObject::selection() const
 {
     return m_layoutObject->frame()->selection().selection();
 }
 
 //
 // Modify or take an action on an object.
 //
 
 void AXLayoutObject::setSelectedTextRange(const PlainTextRange& range)
 {
-    if (isNativeTextControl() && m_layoutObject->isTextControl()) {
+    if (m_layoutObject->isTextControl()) {
         HTMLTextFormControlElement* textControl = toLayoutTextControl(m_layoutObject)->textFormControlElement();
         textControl->setSelectionRange(range.start, range.start + range.length, SelectionHasNoDirection, NotDispatchSelectEvent);
         return;
     }
 
     Document& document = m_layoutObject->document();
     LocalFrame* frame = document.frame();
     if (!frame)
         return;
     Node* node = m_layoutObject->node();
@@ skipping 116 matching lines @@
         return indexForVisiblePosition(position);
 
     return -1;
 }
 
 VisiblePosition AXLayoutObject::visiblePositionForIndex(int index) const
 {
     if (!m_layoutObject)
         return VisiblePosition();
 
-    if (isNativeTextControl() && m_layoutObject->isTextControl())
+    if (m_layoutObject->isTextControl())
         return toLayoutTextControl(m_layoutObject)->textFormControlElement()->visiblePositionForIndex(index);
 
     if (!allowsTextRanges() && !m_layoutObject->isText())
         return VisiblePosition();
 
     Node* node = m_layoutObject->node();
     if (!node)
         return VisiblePosition();
 
     if (index <= 0)
         return VisiblePosition(firstPositionInOrBeforeNode(node), DOWNSTREAM);
 
     Position start, end;
     bool selected = Range::selectNodeContents(node, start, end);
     if (!selected)
         return VisiblePosition();
 
     CharacterIterator it(start, end);
     it.advance(index - 1);
     return VisiblePosition(Position(it.currentContainer(), it.endOffset(), Position::PositionIsOffsetInAnchor), UPSTREAM);
 }
 
 int AXLayoutObject::indexForVisiblePosition(const VisiblePosition& pos) const
 {
-    if (isNativeTextControl() && m_layoutObject->isTextControl()) {
+    if (m_layoutObject->isTextControl()) {
         HTMLTextFormControlElement* textControl = toLayoutTextControl(m_layoutObject)->textFormControlElement();
         return textControl->indexForVisiblePosition(pos);
     }
 
     if (!isTextControl())
         return 0;
 
     Node* node = m_layoutObject->node();
     if (!node)
         return 0;
 
     Position indexPosition = pos.deepEquivalent();
-    if (indexPosition.isNull() || highestEditableRoot(indexPosition, HasEditableAXRole) != node)
+    if (indexPosition.isNull()
+        || (highestEditableRoot(indexPosition) != node
+        && highestEditableRoot(indexPosition, HasEditableAXRole) != node))
         return 0;
 
     RefPtrWillBeRawPtr<Range> range = Range::create(m_layoutObject->document());
     range->setStart(node, 0, IGNORE_EXCEPTION);
     range->setEnd(indexPosition, IGNORE_EXCEPTION);
 
     return TextIterator::rangeLength(range->startPosition(), range->endPosition());
 }
 
 void AXLayoutObject::addInlineTextBoxChildren(bool force)
@@ skipping 68 matching lines @@
     for (const auto& child : children()) {
         // Every child should have aria-role option, and if so, check for selected attribute/state.
         if (child->isSelected() && child->ariaRoleAttribute() == ListBoxOptionRole) {
             result.append(child);
             if (!isMulti)
                 return;
         }
     }
 }
 
-AXObject::PlainTextRange AXLayoutObject::ariaSelectedTextRange() const
+AXObject::PlainTextRange AXLayoutObject::visibleSelectionUnderObject() const
 {
     Node* node = m_layoutObject->node();
     if (!node)
         return PlainTextRange();
 
     VisibleSelection visibleSelection = selection();
     RefPtrWillBeRawPtr<Range> currentSelectionRange = visibleSelection.toNormalizedRange();
     if (!currentSelectionRange || !currentSelectionRange->intersectsNode(node, IGNORE_EXCEPTION))
         return PlainTextRange();
 
@@ skipping 377 matching lines @@
         if (label && label->layoutObject()) {
             LayoutRect labelRect = axObjectCache()->getOrCreate(label)->elementRect();
             result.unite(labelRect);
         }
     }
 
     return result;
 }
 
 } // namespace blink