Use text affinity to return correct accessible line boundaries.

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 1801 matching lines @@
     if (textSelection.isValid())
         return textSelection;
 
     if (!getLayoutObject() || !getLayoutObject()->frame())
         return AXRange();
 
     VisibleSelection selection = getLayoutObject()->frame()->selection().selection();
     if (selection.isNone())
         return AXRange();
 
-    Position visibleStart = selection.visibleStart().toParentAnchoredPosition();
-    Position visibleEnd = selection.visibleEnd().toParentAnchoredPosition();
+    VisiblePosition visibleStart = selection.visibleStart();
+    Position start = visibleStart.toParentAnchoredPosition();
+    TextAffinity startAffinity = visibleStart.affinity();
+    VisiblePosition visibleEnd = selection.visibleEnd();
+    Position end = visibleEnd.toParentAnchoredPosition();
+    TextAffinity endAffinity = visibleEnd.affinity();
 
-    Node* anchorNode = visibleStart.anchorNode();
+    Node* anchorNode = start.anchorNode();
     ASSERT(anchorNode);
 
     AXLayoutObject* anchorObject = nullptr;
     // Find the closest node that has a corresponding AXObject.
     // This is because some nodes may be aria hidden or might not even have
     // a layout object if they are part of the shadow DOM.
     while (anchorNode) {
         anchorObject = getUnignoredObjectFromNode(*anchorNode);
         if (anchorObject)
             break;
 
         if (anchorNode->nextSibling())
             anchorNode = anchorNode->nextSibling();
         else
             anchorNode = anchorNode->parentNode();
     }
 
-    Node* focusNode = visibleEnd.anchorNode();
+    Node* focusNode = end.anchorNode();
     ASSERT(focusNode);
 
     AXLayoutObject* focusObject = nullptr;
     while (focusNode) {
         focusObject = getUnignoredObjectFromNode(*focusNode);
         if (focusObject)
             break;
 
         if (focusNode->previousSibling())
             focusNode = focusNode->previousSibling();
         else
             focusNode = focusNode->parentNode();
     }
 
     if (!anchorObject || !focusObject)
         return AXRange();
 
-    int anchorOffset = anchorObject->indexForVisiblePosition(
-        selection.visibleStart());
+    int anchorOffset = anchorObject->indexForVisiblePosition(visibleStart);
     ASSERT(anchorOffset >= 0);
-    int focusOffset = focusObject->indexForVisiblePosition(
-        selection.visibleEnd());
+    int focusOffset = focusObject->indexForVisiblePosition(visibleEnd);
     ASSERT(focusOffset >= 0);
-    return AXRange(
-        anchorObject, anchorOffset,
-        focusObject, focusOffset);
+    return AXRange(anchorObject, anchorOffset, startAffinity,
+        focusObject, focusOffset, endAffinity);
 }
 
 // Gets only the start and end offsets of the selection computed using the
 // current object as the starting point. Returns a null selection if there is
 // no selection in the subtree rooted at this object.
 AXObject::AXRange AXLayoutObject::selectionUnderObject() const
 {
     AXRange textSelection = textControlSelection();
     if (textSelection.isValid())
         return textSelection;
@@ skipping 36 matching lines @@
             layout = focusedElement->layoutObject();
     }
 
     if (!layout)
         return AXRange();
 
     AXObject* axObject = axObjectCache().getOrCreate(layout);
     if (!axObject || !axObject->isAXLayoutObject())
         return AXRange();
 
+    VisibleSelection selection = layout->frame()->selection().selection();
     HTMLTextFormControlElement* textControl = toLayoutTextControl(
         layout)->textFormControlElement();
     ASSERT(textControl);
     int start = textControl->selectionStart();
     int end = textControl->selectionEnd();
-    return AXRange(axObject, start, axObject, end);
+
+    return AXRange(axObject, start, selection.visibleStart().affinity(),
+        axObject, end, selection.visibleEnd().affinity());
 }
 
 int AXLayoutObject::indexForVisiblePosition(const VisiblePosition& position) const
 {
     if (getLayoutObject() && getLayoutObject()->isTextControl()) {
         HTMLTextFormControlElement* textControl = toLayoutTextControl(
             getLayoutObject())->textFormControlElement();
         return textControl->indexForVisiblePosition(position);
     }
 
@@ skipping 628 matching lines @@
                     result.unite(labelRect);
                 }
             }
         }
     }
 
     return result;
 }
 
 } // namespace blink