Changeset 261653 in webkit

Timestamp:

May 13, 2020 1:51:52 PM (4 years ago)

Author:

Andres Gonzalez

Message:

Remove unnecessary assert in {WebAccessibilityObjectWrapper attachmentView].
​https://bugs.webkit.org/show_bug.cgi?id=211857

Reviewed by Chris Fleizach.

This assert is unnecessary since the backing object that is relevant is
the one on the main thread. This was causing crashes in LayoutTest in
isolated tree mode.

• accessibility/mac/WebAccessibilityObjectWrapperMac.mm:

(-[WebAccessibilityObjectWrapper attachmentView]):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• accessibility/mac/WebAccessibilityObjectWrapperMac.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-05-13  Andres Gonzalez  <andresg_22@apple.com>
+
+        Remove unnecessary assert in {WebAccessibilityObjectWrapper attachmentView].
+        https://bugs.webkit.org/show_bug.cgi?id=211857
+
+        Reviewed by Chris Fleizach.
+
+        This assert is unnecessary since the backing object that is relevant is
+        the one on the main thread. This was causing crashes in LayoutTest in
+        isolated tree mode.
+
+        * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+        (-[WebAccessibilityObjectWrapper attachmentView]):
+
 2020-05-13  Jer Noble  <jer.noble@apple.com>
 

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

@@ -557 +557 @@
 - (id)attachmentView
 {
-    ASSERT(self.axBackingObject->isAttachment());
-
     return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([protectedSelf = retainPtr(self)] () -> RetainPtr<id> {
-        auto* widget = protectedSelf.get().axBackingObject->widgetForAttachmentView();
-        if (!widget)
+        auto* backingObject = protectedSelf.get().axBackingObject;
+        if (!backingObject)
             return nil;
-        return NSAccessibilityUnignoredDescendant(widget->platformWidget());
+
+        auto* widget = backingObject->widgetForAttachmentView();
+        return widget ? NSAccessibilityUnignoredDescendant(widget->platformWidget()) : nil;
     });
 }