Title: [255270] trunk/Source/WebCore
Revision
255270
Author
[email protected]
Date
2020-01-28 12:51:28 -0800 (Tue, 28 Jan 2020)

Log Message

Regression: 30+ layout-test crash on Windows
https://bugs.webkit.org/show_bug.cgi?id=206868

Reviewed by Chris Fleizach.

Instead of getting the AXObjectCache to invoke detachWrapper, detach the wrapper directly.

* accessibility/win/AccessibilityObjectWin.cpp:
(WebCore::AccessibilityObject::detachPlatformWrapper):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (255269 => 255270)


--- trunk/Source/WebCore/ChangeLog	2020-01-28 20:44:37 UTC (rev 255269)
+++ trunk/Source/WebCore/ChangeLog	2020-01-28 20:51:28 UTC (rev 255270)
@@ -1,3 +1,15 @@
+2020-01-28  Andres Gonzalez  <[email protected]>
+
+        Regression: 30+ layout-test crash on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=206868
+
+        Reviewed by Chris Fleizach.
+
+        Instead of getting the AXObjectCache to invoke detachWrapper, detach the wrapper directly.
+
+        * accessibility/win/AccessibilityObjectWin.cpp:
+        (WebCore::AccessibilityObject::detachPlatformWrapper):
+
 2020-01-28  Don Olmstead  <[email protected]>
 
         Non-unified build fixes late January 2020 edition

Modified: trunk/Source/WebCore/accessibility/win/AccessibilityObjectWin.cpp (255269 => 255270)


--- trunk/Source/WebCore/accessibility/win/AccessibilityObjectWin.cpp	2020-01-28 20:44:37 UTC (rev 255269)
+++ trunk/Source/WebCore/accessibility/win/AccessibilityObjectWin.cpp	2020-01-28 20:51:28 UTC (rev 255270)
@@ -34,8 +34,11 @@
 
 void AccessibilityObject::detachPlatformWrapper(AccessibilityDetachmentType detachmentType)
 {
-    if (auto* cache = axObjectCache())
-        cache->detachWrapper(this, detachmentType);
+    // On Windows, AccessibilityObjects are created when get_accChildCount is
+    // called, but they are not wrapped until get_accChild is called, so this
+    // object may not have a wrapper.
+    if (AccessibilityObjectWrapper* wrapper = this->wrapper())
+        wrapper->detach();
 }
 
 bool AccessibilityObject::accessibilityIgnoreAttachment() const
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to