Changeset 285872 in webkit

Timestamp:

Nov 16, 2021, 10:14:09 AM (5 years ago)

Author:

Andres Gonzalez

Message:

Fix for accessibility/mac/replace-text-with-range-on-webarea-element.html in isolated tree mode.
​https://bugs.webkit.org/show_bug.cgi?id=233160
<rdar://problem/85436385>

Reviewed by Chris Fleizach.

Source/WebCore:

Test: accessibility/mac/replace-text-with-range-on-webarea-element.html

The replacement and insertion text string is now properly isolatedCopied
in the AXIsolatedObject method instead of in the wrapper.

• accessibility/isolatedtree/AXIsolatedObject.cpp:

(WebCore::AXIsolatedObject::replaceTextInRange):
(WebCore::AXIsolatedObject::insertText):

• accessibility/mac/WebAccessibilityObjectWrapperMac.mm:

(-[WebAccessibilityObjectWrapper accessibilityReplaceRange:withText:]):
(-[WebAccessibilityObjectWrapper accessibilityInsertText:]):

Tools:

• WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm:

(WTR::AccessibilityUIElement::stringValue):
(WTR::AccessibilityUIElement::replaceTextInRange):
Dispatches to the AX thread the call to the wrapper's
[accessibilityReplaceRange withText:] method.

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.cpp (modified) (2 diffs)
• Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-11-16  Andres Gonzalez  <andresg_22@apple.com>
+
+        Fix for accessibility/mac/replace-text-with-range-on-webarea-element.html in isolated tree mode.
+        https://bugs.webkit.org/show_bug.cgi?id=233160
+        <rdar://problem/85436385>
+
+        Reviewed by Chris Fleizach.
+
+        Test: accessibility/mac/replace-text-with-range-on-webarea-element.html
+
+        The replacement and insertion text string is now properly isolatedCopied
+        in the AXIsolatedObject method instead of in the wrapper.
+
+        * accessibility/isolatedtree/AXIsolatedObject.cpp:
+        (WebCore::AXIsolatedObject::replaceTextInRange):
+        (WebCore::AXIsolatedObject::insertText):
+        * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+        (-[WebAccessibilityObjectWrapper accessibilityReplaceRange:withText:]):
+        (-[WebAccessibilityObjectWrapper accessibilityInsertText:]):
+
 2021-11-16  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.cpp

@@ -1197 +1197 @@
 bool AXIsolatedObject::replaceTextInRange(const String& replacementText, const PlainTextRange& textRange)
 {
-    return Accessibility::retrieveValueFromMainThread<bool>([&replacementText, &textRange, this] () -> bool {
+    return Accessibility::retrieveValueFromMainThread<bool>([text = replacementText.isolatedCopy(), &textRange, this] () -> bool {
         if (auto* axObject = associatedAXObject())
-            return axObject->replaceTextInRange(replacementText, textRange);
+            return axObject->replaceTextInRange(text, textRange);
         return false;
     });
@@ -1206 +1206 @@
 bool AXIsolatedObject::insertText(const String& text)
 {
-    return Accessibility::retrieveValueFromMainThread<bool>([&text, this] () -> bool {
+    return Accessibility::retrieveValueFromMainThread<bool>([text = text.isolatedCopy(), this] () -> bool {
         if (auto* axObject = associatedAXObject())
             return axObject->insertText(text);

trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm

@@ -3278 +3278 @@
 {
     auto* backingObject = self.updateObjectBackingStore;
-    if (!backingObject)
-        return NO;
-
-    return backingObject->replaceTextInRange(String(string).isolatedCopy(), PlainTextRange(range));
+    return backingObject ? backingObject->replaceTextInRange(String(string), PlainTextRange(range)) : NO;
 }
 
@@ -3287 +3284 @@
 {
     auto* backingObject = self.updateObjectBackingStore;
-    if (!backingObject)
-        return NO;
-
-    return backingObject->insertText(String(text).isolatedCopy());
+    return backingObject ? backingObject->insertText(String(text)) : NO;
 }
 

trunk/Tools/ChangeLog

@@ +1 @@
+2021-11-16  Andres Gonzalez  <andresg_22@apple.com>
+
+        Fix for accessibility/mac/replace-text-with-range-on-webarea-element.html in isolated tree mode.
+        https://bugs.webkit.org/show_bug.cgi?id=233160
+        <rdar://problem/85436385>
+
+        Reviewed by Chris Fleizach.
+
+        * WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm:
+        (WTR::AccessibilityUIElement::stringValue):
+        (WTR::AccessibilityUIElement::replaceTextInRange):
+        Dispatches to the AX thread the call to the wrapper's
+        [accessibilityReplaceRange withText:] method.
+
 2021-11-16  Brady Eidson  <beidson@apple.com>
 

trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm

@@ -767 +767 @@
 {
     BEGIN_AX_OBJC_EXCEPTIONS
-    NSString *description = descriptionOfValue(attributeValue(NSAccessibilityValueAttribute).get());
+    auto value = attributeValue(NSAccessibilityValueAttribute);
+    NSString *description = descriptionOfValue(value.get());
     if (description)
         return concatenateAttributeAndValue(@"AXValue", description);
@@ -2031 +2032 @@
 bool AccessibilityUIElement::replaceTextInRange(JSStringRef string, int location, int length)
 {
-    BEGIN_AX_OBJC_EXCEPTIONS
-    return [m_element accessibilityReplaceRange:NSMakeRange(location, length) withText:[NSString stringWithJSStringRef:string]];
-    END_AX_OBJC_EXCEPTIONS
-    return false;
+    bool result = false;
+
+    BEGIN_AX_OBJC_EXCEPTIONS
+    AccessibilityUIElement::s_controller->executeOnAXThreadAndWait([text = [NSString stringWithJSStringRef:string], range = NSMakeRange(location, length), this, &result] {
+        result = [m_element accessibilityReplaceRange:range withText:text];
+    });
+    END_AX_OBJC_EXCEPTIONS
+
+    return result;
 }