Title: [160015] trunk/Source/WebKit/mac
Revision
160015
Author
[email protected]
Date
2013-12-03 10:44:32 -0800 (Tue, 03 Dec 2013)

Log Message

AX: Crash in accessibilityRoot when Document goes away
https://bugs.webkit.org/show_bug.cgi?id=125113

Reviewed by Tim Horton.

The AXObjectCache can sometimes be null if the render tree has been detached from the document.

* WebView/WebFrame.mm:
(-[WebFrame accessibilityRoot]):

Modified Paths

Diff

Modified: trunk/Source/WebKit/mac/ChangeLog (160014 => 160015)


--- trunk/Source/WebKit/mac/ChangeLog	2013-12-03 18:28:54 UTC (rev 160014)
+++ trunk/Source/WebKit/mac/ChangeLog	2013-12-03 18:44:32 UTC (rev 160015)
@@ -1,3 +1,15 @@
+2013-12-02  Chris Fleizach  <[email protected]>
+
+        AX: Crash in accessibilityRoot when Document goes away
+        https://bugs.webkit.org/show_bug.cgi?id=125113
+
+        Reviewed by Tim Horton.
+
+        The AXObjectCache can sometimes be null if the render tree has been detached from the document.
+
+        * WebView/WebFrame.mm:
+        (-[WebFrame accessibilityRoot]):
+
 2013-11-28  Antti Koivisto  <[email protected]>
 
         Remove feature: CSS variables

Modified: trunk/Source/WebKit/mac/WebView/WebFrame.mm (160014 => 160015)


--- trunk/Source/WebKit/mac/WebView/WebFrame.mm	2013-12-03 18:28:54 UTC (rev 160014)
+++ trunk/Source/WebKit/mac/WebView/WebFrame.mm	2013-12-03 18:44:32 UTC (rev 160015)
@@ -1209,10 +1209,14 @@
         AXObjectCache::setEnhancedUserInterfaceAccessibility([[NSApp accessibilityAttributeValue:NSAccessibilityEnhancedUserInterfaceAttribute] boolValue]);
     }
     
-    if (!_private->coreFrame || !_private->coreFrame->document())
+    if (!_private->coreFrame)
         return nil;
     
-    AccessibilityObject* rootObject = _private->coreFrame->document()->axObjectCache()->rootObjectForFrame(_private->coreFrame);
+    Document* document = _private->coreFrame->document();
+    if (!document || !document->axObjectCache())
+        return nil;
+    
+    AccessibilityObject* rootObject = document->axObjectCache()->rootObjectForFrame(_private->coreFrame);
     if (!rootObject)
         return nil;
     
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to