WIP: Modified AXPosition to work with objects with both embedded object characters and text.

third_party/WebKit/Source/modules/accessibility/AXObjectImpl.cpp

Index: third_party/WebKit/Source/modules/accessibility/AXObjectImpl.cpp
diff --git a/third_party/WebKit/Source/modules/accessibility/AXObjectImpl.cpp b/third_party/WebKit/Source/modules/accessibility/AXObjectImpl.cpp
index 0141a1d83ea42897e41ab15ff5b61d92fb6b885e..e2843ac47cd3d2be8331c106b5cf141ce633cd91 100644
--- a/third_party/WebKit/Source/modules/accessibility/AXObjectImpl.cpp
+++ b/third_party/WebKit/Source/modules/accessibility/AXObjectImpl.cpp
@@ -34,6 +34,7 @@
 #include "core/dom/AccessibleNode.h"
 #include "core/dom/UserGestureIndicator.h"
 #include "core/editing/EditingUtilities.h"
+#include "core/editing/FrameSelection.h"
 #include "core/editing/VisibleUnits.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/LocalFrameView.h"
@@ -43,6 +44,10 @@
 #include "core/html/HTMLInputElement.h"
 #include "core/html/parser/HTMLParserIdioms.h"
 #include "core/layout/LayoutBoxModelObject.h"
+#include "core/layout/line/AbstractInlineTextBox.h"
+#include "core/layout/line/InlineBox.h"
+#include "core/layout/line/InlineTextBox.h"
+#include "modules/accessibility/AXInlineTextBox.h"
 #include "modules/accessibility/AXObjectCacheImpl.h"
 #include "platform/text/PlatformLocale.h"
 #include "platform/wtf/HashSet.h"
@@ -1434,6 +1439,80 @@ const AtomicString& AXObjectImpl::GetAttribute(
   return g_null_atom;
 }
 
+AXRange AXObject::Selection() const {
+  Document* document = GetDocument();
+  if (!document)
+    return AXRange();
+  LocalFrame* frame = document->GetFrame();
+  if (!frame)
+    return AXRange();
+
+  const VisibleSelectionInFlatTree& visible_selection =
+      frame->Selection().ComputeVisibleSelectionInFlatTree();
+  if (visible_selection.IsNone())
+    return AXRange();
+
+  AXObject* anchor_object = nullptr;
+  int anchor_offset;
+  ComputeAXObjectAndOffset(visible_selection.VisibleStart(), &anchor_object,
+                           &anchor_offset);
+  AXObject* focus_object = nullptr;
+  int focus_offset;
+  ComputeAXObjectAndOffset(visible_selection.VisibleStart(), &focus_object,
+                           &focus_offset);
+
+  if (!anchor_object || !focus_object)
+    return AXRange();
+  return AXRange(anchor_object, anchor_offset, focus_object, focus_offset,
+                 visible_selection.Affinity());
+}
+
+void AXObject::ComputeAXObjectAndOffset(
+    const VisiblePositionInFlatTree& position,
+    AXObject** ax_object,
+    int* offset) const {
+  *ax_object = nullptr;
+  *offset = 0;
+  if (position.IsNull())
+    return;
+
+  InlineBoxPosition box_position =
+      ComputeInlineBoxPosition(position.DeepEquivalent(), position.Affinity());
+  InlineBox* inline_box = box_position.inline_box;
+  if (inline_box && inline_box->IsInlineTextBox()) {
+    InlineTextBox* inline_text_box = ToInlineTextBox(inline_box);
+    RefPtr<AbstractInlineTextBox> abstract_inline_text_box =
+        AbstractInlineTextBox::GetOrCreate(inline_text_box->GetLineLayoutItem(),
+                                           inline_text_box);
+    *ax_object = AxObjectCache().GetOrCreate(abstract_inline_text_box);
+  } else {
+    Node* anchor_node = position.DeepEquivalent().AnchorNode();
+    DCHECK(anchor_node);
+    switch (position.DeepEquivalent().AnchorType()) {
+      case PositionAnchorType::kOffsetInAnchor:
+      case PositionAnchorType::kBeforeAnchor:
+      case PositionAnchorType::kAfterAnchor:
+        break;
+
+      case PositionAnchorType::kBeforeChildren:
+        if (EditingInFlatTreeStrategy::FirstChild(*anchor_node))
+          anchor_node = EditingInFlatTreeStrategy::FirstChild(*anchor_node);
+        break;
+      case PositionAnchorType::kAfterChildren:
+        if (EditingInFlatTreeStrategy::LastChild(*anchor_node))
+          anchor_node = EditingInFlatTreeStrategy::LastChild(*anchor_node);
+        break;
+    }
+    LayoutObject* layout_object = anchor_node->GetLayoutObject();
+    if (layout_object) {
+      *ax_object = AxObjectCache().GetOrCreate(layout_object);
+    } else {
+      *ax_object = AxObjectCache().GetOrCreate(anchor_node);
+    }
+  }
+  *offset = box_position.offset_in_box;
+}
+
 //
 // Scrollable containers.
 //