From 62494de24f8d4aa003b6ff911e025e07a6d7a117 Mon Sep 17 00:00:00 2001
From: Eitan Isaacson <eitan@monotonous.org>
Date: Fri, 14 Aug 2020 23:18:02 +0000
Subject: [PATCH] Bug 1659215 - Re-expose text attributes. r=morgan

Differential Revision: https://phabricator.services.mozilla.com/D87149
---
 accessible/mac/MOXAccessibleProtocol.h              | 9 +++------
 accessible/tests/browser/mac/browser_text_basics.js | 2 +-
 accessible/tests/browser/mac/browser_text_input.js  | 4 ++--
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/accessible/mac/MOXAccessibleProtocol.h b/accessible/mac/MOXAccessibleProtocol.h
index 5a3b78fe7e87..bc93f22de3fc 100644
--- a/accessible/mac/MOXAccessibleProtocol.h
+++ b/accessible/mac/MOXAccessibleProtocol.h
@@ -349,12 +349,10 @@
 
 #pragma mark - ParameterizedTextAttributeGetters
 
-// Bug 1657653: This is too slow for now
-// AXLengthForTextMarkerRange_
+// AXLengthForTextMarkerRange
 - (NSNumber* _Nullable)moxLengthForTextMarkerRange:(id _Nonnull)textMarkerRange;
 
-// Bug 1657653: This is too slow for now
-// AXStringForTextMarkerRange_
+// AXStringForTextMarkerRange
 - (NSString* _Nullable)moxStringForTextMarkerRange:(id _Nonnull)textMarkerRange;
 
 // AXTextMarkerRangeForUnorderedTextMarkers
@@ -378,8 +376,7 @@
 // AXPreviousTextMarkerForTextMarker
 - (id _Nullable)moxPreviousTextMarkerForTextMarker:(id _Nonnull)textMarker;
 
-// Bug 1657653: This is too slow for now
-// AXAttributedStringForTextMarkerRange_
+// AXAttributedStringForTextMarkerRange
 - (NSAttributedString* _Nullable)moxAttributedStringForTextMarkerRange:(id _Nonnull)textMarkerRange;
 
 @end
diff --git a/accessible/tests/browser/mac/browser_text_basics.js b/accessible/tests/browser/mac/browser_text_basics.js
index 62734a9419d8..65f639d26120 100644
--- a/accessible/tests/browser/mac/browser_text_basics.js
+++ b/accessible/tests/browser/mac/browser_text_basics.js
@@ -13,7 +13,7 @@ loadScripts(
 
 function stringForRange(macDoc, range) {
   return macDoc.getParameterizedAttributeValue(
-    "AXStringForTextMarkerRange_",
+    "AXStringForTextMarkerRange",
     range
   );
 }
diff --git a/accessible/tests/browser/mac/browser_text_input.js b/accessible/tests/browser/mac/browser_text_input.js
index 9b40975afef8..960140edaa7c 100644
--- a/accessible/tests/browser/mac/browser_text_input.js
+++ b/accessible/tests/browser/mac/browser_text_input.js
@@ -57,7 +57,7 @@ function testValueChangedEventData(
     textMarker
   );
   let str = macIface.getParameterizedAttributeValue(
-    "AXStringForTextMarkerRange_",
+    "AXStringForTextMarkerRange",
     range,
     "correct word before caret"
   );
@@ -100,7 +100,7 @@ async function synthKeyAndTestSelectionChanged(
   );
 
   let rangeString = inputEvent.macIface.getParameterizedAttributeValue(
-    "AXStringForTextMarkerRange_",
+    "AXStringForTextMarkerRange",
     inputEvent.data.AXSelectedTextMarkerRange
   );
   is(