Changeset 261687 in webkit

Timestamp:

May 14, 2020 5:44:28 AM (4 years ago)

Author:

Andres Gonzalez

Message:

Replacing and inserting text need to be dispatched to the main thread.
​https://bugs.webkit.org/show_bug.cgi?id=211863

Reviewed by Chris Fleizach.

Covered by existing tests.

In isolated tree mode WebAccessibilityObjectWrapper accessibilityReplaceRange
and InsertText may be called on the secondary thread. Thus the AXIsolatedObject
implementation of this functionality needs to forward these calls to the
associated AXObject on the main thread.

• accessibility/isolatedtree/AXIsolatedObject.cpp:

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

• accessibility/mac/WebAccessibilityObjectWrapperMac.mm:

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

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• accessibility/isolatedtree/AXIsolatedObject.cpp (modified) (1 diff)
• accessibility/mac/WebAccessibilityObjectWrapperMac.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-05-14  Andres Gonzalez  <andresg_22@apple.com>
+
+        Replacing and inserting text need to be dispatched to the main thread.
+        https://bugs.webkit.org/show_bug.cgi?id=211863
+
+        Reviewed by Chris Fleizach.
+
+        Covered by existing tests.
+
+        In isolated tree mode WebAccessibilityObjectWrapper accessibilityReplaceRange
+        and InsertText may be called on the secondary thread. Thus the AXIsolatedObject
+        implementation of this functionality needs to forward these calls to the
+        associated AXObject on the main thread.
+
+        * accessibility/isolatedtree/AXIsolatedObject.cpp:
+        (WebCore::AXIsolatedObject::replaceTextInRange):
+        (WebCore::AXIsolatedObject::insertText):
+        * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+        (-[WebAccessibilityObjectWrapper accessibilityReplaceRange:withText:]):
+        (-[WebAccessibilityObjectWrapper accessibilityInsertText:]):
+
 2020-05-14  Antoine Quint  <graouts@apple.com>
 

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

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

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

@@ -3473 +3473 @@
         return NO;
 
-    return backingObject->replaceTextInRange(string, PlainTextRange(range));
+    return backingObject->replaceTextInRange(String(string).isolatedCopy(), PlainTextRange(range));
 }
 
@@ -3482 +3482 @@
         return NO;
 
-    return backingObject->insertText(text);
+    return backingObject->insertText(String(text).isolatedCopy());
 }