Added selectionStart/EndLineNumber functions in preparation for updating layout tests to stop using insertionPointLineNumber and selectedTextRange functions which are either unwieldy to use or do not provide all the information needed by tests.

BUG=347859
R=dmazzoni

Review URL: https://codereview.chromium.org/1076383003

Cr-Commit-Position: refs/heads/master@{#324897}

2 files changed, 20 insertions, 0 deletions

diff --git a/content/shell/renderer/test_runner/web_ax_object_proxy.cc b/content/shell/renderer/test_runner/web_ax_object_proxy.cc
index d139fda0..5649602 100644
--- a/content/shell/renderer/test_runner/web_ax_object_proxy.cc
+++ b/content/shell/renderer/test_runner/web_ax_object_proxy.cc
@@ -488,6 +488,10 @@ WebAXObjectProxy::GetObjectTemplateBuilder(v8::Isolate* isolate) {
       .SetProperty("childrenCount", &WebAXObjectProxy::ChildrenCount)
       .SetProperty("selectionStart", &WebAXObjectProxy::SelectionStart)
       .SetProperty("selectionEnd", &WebAXObjectProxy::SelectionEnd)
+      .SetProperty("selectionStartLineNumber",
+                   &WebAXObjectProxy::SelectionStartLineNumber)
+      .SetProperty("selectionEndLineNumber",
+                   &WebAXObjectProxy::SelectionEndLineNumber)
       .SetProperty("insertionPointLineNumber",
                    &WebAXObjectProxy::InsertionPointLineNumber)
       .SetProperty("selectedTextRange", &WebAXObjectProxy::SelectedTextRange)
@@ -727,6 +731,17 @@ int WebAXObjectProxy::SelectionEnd() {
   return accessibility_object_.selectionEnd();
 }
 
+int WebAXObjectProxy::SelectionStartLineNumber() {
+  accessibility_object_.updateLayoutAndCheckValidity();
+  return accessibility_object_.selectionStartLineNumber();
+}
+
+int WebAXObjectProxy::SelectionEndLineNumber() {
+  accessibility_object_.updateLayoutAndCheckValidity();
+  return accessibility_object_.selectionEndLineNumber();
+}
+
+// TODO(nektar): Remove this function after updating tests.
 int WebAXObjectProxy::InsertionPointLineNumber() {
   accessibility_object_.updateLayoutAndCheckValidity();
   if (!accessibility_object_.isFocused())
@@ -734,6 +749,7 @@ int WebAXObjectProxy::InsertionPointLineNumber() {
   return accessibility_object_.selectionEndLineNumber();
 }
 
+// TODO(nektar): Remove this function after updating tests.
 std::string WebAXObjectProxy::SelectedTextRange() {
   accessibility_object_.updateLayoutAndCheckValidity();
   unsigned selection_start = accessibility_object_.selectionStart();
diff --git a/content/shell/renderer/test_runner/web_ax_object_proxy.h b/content/shell/renderer/test_runner/web_ax_object_proxy.h
index 9a48d49..b734296 100644
--- a/content/shell/renderer/test_runner/web_ax_object_proxy.h
+++ b/content/shell/renderer/test_runner/web_ax_object_proxy.h
@@ -71,7 +71,11 @@ class WebAXObjectProxy : public gin::Wrappable<WebAXObjectProxy> {
   int ChildrenCount();
   int SelectionStart();
   int SelectionEnd();
+  int SelectionStartLineNumber();
+  int SelectionEndLineNumber();
+  // TODO(nektar): Remove this function after updating tests.
   int InsertionPointLineNumber();
+  // TODO(nektar): Remove this function after updating tests.
   std::string SelectedTextRange();
   bool IsEnabled();
   bool IsRequired();