Changeset 258704 in webkit
- Timestamp:
- Mar 19, 2020 10:02:26 AM (4 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r258702 r258704 1 2020-03-19 Andres Gonzalez <andresg_22@apple.com> 2 3 [WebAccessibilityObjectWrapper remoteAccessibilityParentObject] must run on the main thread. 4 https://bugs.webkit.org/show_bug.cgi?id=209284 5 6 Reviewed by Chris Fleizach. 7 8 - Dispatch [WebAccessibilityObjectWrapper remoteAccessibilityParentObject] to the main thread. 9 - [WebAccessibilityObjectWrapper windowElement:] must then call it outside the dispatched lambda. 10 11 * accessibility/mac/WebAccessibilityObjectWrapperMac.mm: 12 (-[WebAccessibilityObjectWrapper remoteAccessibilityParentObject]): 13 (-[WebAccessibilityObjectWrapper windowElement:]): 14 1 15 2020-03-19 Antoine Quint <graouts@apple.com> 2 16 -
trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm
r258681 r258704 1874 1874 - (id)remoteAccessibilityParentObject 1875 1875 { 1876 ASSERT(isMainThread()); 1877 if (!self.axBackingObject) 1876 return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([protectedSelf = retainPtr(self)] () -> RetainPtr<id> { 1877 auto* backingObject = protectedSelf.get().axBackingObject; 1878 if (!backingObject) 1879 return nil; 1880 1881 if (auto* document = backingObject->document()) { 1882 if (auto* frame = document->frame()) 1883 return frame->loader().client().accessibilityRemoteObject(); 1884 } 1885 1878 1886 return nil; 1879 1880 if (auto* document = self.axBackingObject->document()) { 1881 if (auto* frame = document->frame()) 1882 return frame->loader().client().accessibilityRemoteObject(); 1883 } 1884 1885 return nil; 1887 }); 1886 1888 } 1887 1889 … … 2285 2287 - (id)windowElement:(NSString*)attributeName 2286 2288 { 2287 return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([attributeName, protectedSelf = retainPtr(self)] () -> RetainPtr<id> { 2288 id remoteParent = [protectedSelf remoteAccessibilityParentObject]; 2289 if (remoteParent) { 2290 ALLOW_DEPRECATED_DECLARATIONS_BEGIN 2291 return [remoteParent accessibilityAttributeValue:attributeName]; 2292 ALLOW_DEPRECATED_DECLARATIONS_END 2293 } 2294 2289 if (id remoteParent = self.remoteAccessibilityParentObject) { 2290 ALLOW_DEPRECATED_DECLARATIONS_BEGIN 2291 return [remoteParent accessibilityAttributeValue:attributeName]; 2292 ALLOW_DEPRECATED_DECLARATIONS_END 2293 } 2294 2295 return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([protectedSelf = retainPtr(self)] () -> RetainPtr<id> { 2295 2296 auto* backingObject = protectedSelf.get().axBackingObject; 2296 2297 if (!backingObject)
Note: See TracChangeset
for help on using the changeset viewer.