Title: [255661] trunk/Source/WebCore
- Revision
- 255661
- Author
- andresg...@apple.com
- Date
- 2020-02-03 21:37:30 -0800 (Mon, 03 Feb 2020)
Log Message
[WebAccessibilityObjectWrapper detach] should detach either the wrapped AXObject or the IsolatedObject but not both.
https://bugs.webkit.org/show_bug.cgi?id=207178
Reviewed by Chris Fleizach.
Detach either the AXObject or the IsolatedObject depending on the thread that the method is invoed on.
* accessibility/mac/WebAccessibilityObjectWrapperBase.mm:
(-[WebAccessibilityObjectWrapperBase detachAXObject]):
(-[WebAccessibilityObjectWrapperBase detachIsolatedObject]):
(-[WebAccessibilityObjectWrapperBase detach]): Detach one or the other depending on the thread.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (255660 => 255661)
--- trunk/Source/WebCore/ChangeLog 2020-02-04 05:29:51 UTC (rev 255660)
+++ trunk/Source/WebCore/ChangeLog 2020-02-04 05:37:30 UTC (rev 255661)
@@ -1,3 +1,17 @@
+2020-02-03 Andres Gonzalez <andresg...@apple.com>
+
+ [WebAccessibilityObjectWrapper detach] should detach either the wrapped AXObject or the IsolatedObject but not both.
+ https://bugs.webkit.org/show_bug.cgi?id=207178
+
+ Reviewed by Chris Fleizach.
+
+ Detach either the AXObject or the IsolatedObject depending on the thread that the method is invoed on.
+
+ * accessibility/mac/WebAccessibilityObjectWrapperBase.mm:
+ (-[WebAccessibilityObjectWrapperBase detachAXObject]):
+ (-[WebAccessibilityObjectWrapperBase detachIsolatedObject]):
+ (-[WebAccessibilityObjectWrapperBase detach]): Detach one or the other depending on the thread.
+
2020-02-03 Sihui Liu <sihui_...@apple.com>
Crash in WebCore::IDBServer::IDBServer::createIndex
Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm (255660 => 255661)
--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm 2020-02-04 05:29:51 UTC (rev 255660)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm 2020-02-04 05:37:30 UTC (rev 255661)
@@ -310,13 +310,29 @@
}
#endif
-- (void)detach
+- (void)detachAXObject
{
m_axObject = nullptr;
+}
+
#if ENABLE(ACCESSIBILITY_ISOLATED_TREE)
+- (void)detachIsolatedObject
+{
m_isolatedObject = nullptr;
+}
#endif
+
+- (void)detach
+{
_identifier = InvalidAXID;
+#if ENABLE(ACCESSIBILITY_ISOLATED_TREE)
+ if (!isMainThread()) {
+ ASSERT(AXObjectCache::clientSupportsIsolatedTree());
+ [self detachIsolatedObject];
+ return;
+ }
+#endif
+ [self detachAXObject];
}
- (BOOL)updateObjectBackingStore
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
