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

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

 /*
  * Copyright (C) 2012, Google 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 1400 matching lines @@
   DocumentMarkerController& marker_controller = GetDocument()->Markers();
   DocumentMarkerVector markers = marker_controller.MarkersFor(GetNode());
   for (size_t i = 0; i < markers.size(); ++i) {
     DocumentMarker* marker = markers[i];
     switch (marker->GetType()) {
       case DocumentMarker::kSpelling:
       case DocumentMarker::kGrammar:
       case DocumentMarker::kTextMatch:
       case DocumentMarker::kActiveSuggestion:
         marker_types.push_back(marker->GetType());
-        marker_ranges.push_back(
-            AXRange(marker->StartOffset(), marker->EndOffset()));
+        marker_ranges.emplace_back(
+            const_cast<AXNodeObject*>(this), marker->StartOffset(),
+            const_cast<AXNodeObject*>(this), marker->EndOffset());
         break;
       case DocumentMarker::kComposition:
         // No need for accessibility to know about these marker types.
         break;
     }
   }
 }
 
 AXObjectImpl* AXNodeObject::InPageLinkTarget() const {
   if (!node_ || !isHTMLAnchorElement(node_) || !GetDocument())
@@ skipping 578 matching lines @@
     html_element = ToHTMLElement(GetNode());
   if (html_element && IsLabelableElement(html_element)) {
     if (ToLabelableElement(html_element)->labels() &&
         ToLabelableElement(html_element)->labels()->length() > 0)
       return true;
   }
 
   return false;
 }
 
+bool AXNodeObject::NameFromContents() const {
+  Node* node = GetNode();
+  if (!node || !node->IsElementNode())
+    return AXObject::NameFromContents();
+  // AXObject::nameFromContents determines whether an element should take its
+  // name from its descendant contents based on role. However, <select> is a
+  // special case, as unlike a typical pop-up button it contains its own pop-up
+  // menu's contents, which should not be used as the name.
+  if (isHTMLSelectElement(node))
+    return false;
+  return AXObject::NameFromContents();
+}
+
+AXRange AXNodeObject::Selection() const {
+  if (!GetNode())
+    return AXObject::Selection();
+  if (IsTextControlElement(GetNode())) {
+    TextControlElement* text_control = ToTextControlElement(GetNode());
+    return AXRange(const_cast<AXNodeObject*>(this),
+                   text_control->selectionStart(),
+                   const_cast<AXNodeObject*>(this),
+                   text_control->selectionEnd(), TextAffinity::kDownstream);
+  }
+  return AXObject::Selection();
+}
+
 void AXNodeObject::GetRelativeBounds(
     AXObjectImpl** out_container,
     FloatRect& out_bounds_in_container,
     SkMatrix44& out_container_transform) const {
   if (LayoutObjectForRelativeBounds()) {
     AXObjectImpl::GetRelativeBounds(out_container, out_bounds_in_container,
                                     out_container_transform);
     return;
   }
 
@@ skipping 1184 matching lines @@
     return String();
   return ToTextControlElement(node)->StrippedPlaceholder();
 }
 
 DEFINE_TRACE(AXNodeObject) {
   visitor->Trace(node_);
   AXObjectImpl::Trace(visitor);
 }
 
 }  // namespace blink