Use text affinity to return correct accessible line boundaries.

components/test_runner/web_ax_object_proxy.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/test_runner/web_ax_object_proxy.h"
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "base/strings/stringprintf.h"
@@ skipping 517 matching lines @@
       .SetProperty("height", &WebAXObjectProxy::Height)
       .SetProperty("intValue", &WebAXObjectProxy::IntValue)
       .SetProperty("minValue", &WebAXObjectProxy::MinValue)
       .SetProperty("maxValue", &WebAXObjectProxy::MaxValue)
       .SetProperty("valueDescription", &WebAXObjectProxy::ValueDescription)
       .SetProperty("childrenCount", &WebAXObjectProxy::ChildrenCount)
       .SetProperty("selectionAnchorObject",
                    &WebAXObjectProxy::SelectionAnchorObject)
       .SetProperty("selectionAnchorOffset",
                    &WebAXObjectProxy::SelectionAnchorOffset)
+      .SetProperty("selectionAnchorAffinity",
+                   &WebAXObjectProxy::SelectionAnchorAffinity)
       .SetProperty("selectionFocusObject",
                    &WebAXObjectProxy::SelectionFocusObject)
       .SetProperty("selectionFocusOffset",
                    &WebAXObjectProxy::SelectionFocusOffset)
+      .SetProperty("selectionFocusAffinity",
+                   &WebAXObjectProxy::SelectionFocusAffinity)
       .SetProperty("selectionStart", &WebAXObjectProxy::SelectionStart)
       .SetProperty("selectionEnd", &WebAXObjectProxy::SelectionEnd)
       .SetProperty("selectionStartLineNumber",
                    &WebAXObjectProxy::SelectionStartLineNumber)
       .SetProperty("selectionEndLineNumber",
                    &WebAXObjectProxy::SelectionEndLineNumber)
       .SetProperty("isEnabled", &WebAXObjectProxy::IsEnabled)
       .SetProperty("isRequired", &WebAXObjectProxy::IsRequired)
       .SetProperty("isEditable", &WebAXObjectProxy::IsEditable)
       .SetProperty("isRichlyEditable", &WebAXObjectProxy::IsRichlyEditable)
@@ skipping 229 matching lines @@
   if (!IsRoot())
     count = accessibility_object_.childCount();
   return count;
 }
 
 v8::Local<v8::Value> WebAXObjectProxy::SelectionAnchorObject() {
   accessibility_object_.updateLayoutAndCheckValidity();
 
   blink::WebAXObject anchorObject;
   int anchorOffset = -1;
+  blink::WebAXTextAffinity anchorAffinity;
   blink::WebAXObject focusObject;
   int focusOffset = -1;
-  accessibility_object_.selection(anchorObject, anchorOffset,
-                                  focusObject, focusOffset);
+  blink::WebAXTextAffinity focusAffinity;
+  accessibility_object_.selection(anchorObject, anchorOffset, anchorAffinity,
+                                  focusObject, focusOffset, focusAffinity);
   if (anchorObject.isNull())
     return v8::Null(blink::mainThreadIsolate());
 
   return factory_->GetOrCreate(anchorObject);
 }
 
 int WebAXObjectProxy::SelectionAnchorOffset() {
   accessibility_object_.updateLayoutAndCheckValidity();
 
   blink::WebAXObject anchorObject;
   int anchorOffset = -1;
+  blink::WebAXTextAffinity anchorAffinity;
   blink::WebAXObject focusObject;
   int focusOffset = -1;
-  accessibility_object_.selection(anchorObject, anchorOffset,
-                                  focusObject, focusOffset);
+  blink::WebAXTextAffinity focusAffinity;
+  accessibility_object_.selection(anchorObject, anchorOffset, anchorAffinity,
+                                  focusObject, focusOffset, focusAffinity);
   if (anchorOffset < 0)
     return -1;
 
   return anchorOffset;
 }
 
+std::string WebAXObjectProxy::SelectionAnchorAffinity() {
+  accessibility_object_.updateLayoutAndCheckValidity();
+
+  blink::WebAXObject anchorObject;
+  int anchorOffset = -1;
+  blink::WebAXTextAffinity anchorAffinity;
+  blink::WebAXObject focusObject;
+  int focusOffset = -1;
+  blink::WebAXTextAffinity focusAffinity;
+  accessibility_object_.selection(anchorObject, anchorOffset, anchorAffinity,
+                                  focusObject, focusOffset, focusAffinity);
+  return anchorAffinity == blink::WebAXTextAffinityUpstream ?
+      "upstream" : "downstream";
+}
+
 v8::Local<v8::Value> WebAXObjectProxy::SelectionFocusObject() {
   accessibility_object_.updateLayoutAndCheckValidity();
 
   blink::WebAXObject anchorObject;
   int anchorOffset = -1;
+  blink::WebAXTextAffinity anchorAffinity;
   blink::WebAXObject focusObject;
   int focusOffset = -1;
-  accessibility_object_.selection(anchorObject, anchorOffset,
-                                  focusObject, focusOffset);
+  blink::WebAXTextAffinity focusAffinity;
+  accessibility_object_.selection(anchorObject, anchorOffset, anchorAffinity,
+                                  focusObject, focusOffset, focusAffinity);
   if (focusObject.isNull())
     return v8::Null(blink::mainThreadIsolate());
 
   return factory_->GetOrCreate(focusObject);
 }
 
 int WebAXObjectProxy::SelectionFocusOffset() {
   accessibility_object_.updateLayoutAndCheckValidity();
 
   blink::WebAXObject anchorObject;
   int anchorOffset = -1;
+  blink::WebAXTextAffinity anchorAffinity;
   blink::WebAXObject focusObject;
   int focusOffset = -1;
-  accessibility_object_.selection(anchorObject, anchorOffset,
-                                  focusObject, focusOffset);
+  blink::WebAXTextAffinity focusAffinity;
+  accessibility_object_.selection(anchorObject, anchorOffset, anchorAffinity,
+                                  focusObject, focusOffset, focusAffinity);
   if (focusOffset < 0)
     return -1;
 
   return focusOffset;
 }
 
+std::string WebAXObjectProxy::SelectionFocusAffinity() {
+  accessibility_object_.updateLayoutAndCheckValidity();
+
+  blink::WebAXObject anchorObject;
+  int anchorOffset = -1;
+  blink::WebAXTextAffinity anchorAffinity;
+  blink::WebAXObject focusObject;
+  int focusOffset = -1;
+  blink::WebAXTextAffinity focusAffinity;
+  accessibility_object_.selection(anchorObject, anchorOffset, anchorAffinity,
+                                  focusObject, focusOffset, focusAffinity);
+  return focusAffinity == blink::WebAXTextAffinityUpstream ?
+      "upstream" : "downstream";
+}
+
 int WebAXObjectProxy::SelectionStart() {
   accessibility_object_.updateLayoutAndCheckValidity();
   return accessibility_object_.selectionStart();
 }
 
 int WebAXObjectProxy::SelectionEnd() {
   accessibility_object_.updateLayoutAndCheckValidity();
   return accessibility_object_.selectionEnd();
 }
 
@@ skipping 796 matching lines @@
   v8::Local<v8::Value> value_handle = gin::CreateHandle(
       isolate, new WebAXObjectProxy(object, this)).ToV8();
   if (value_handle.IsEmpty())
     return v8::Local<v8::Object>();
   v8::Local<v8::Object> handle = value_handle->ToObject(isolate);
   elements_.Append(handle);
   return handle;
 }
 
 }  // namespace test_runner