Changeset 244781 in webkit

Timestamp:

Apr 30, 2019, 10:37:47 AM (7 years ago)

Author:

timothy_horton@apple.com

Message:

Long-standing rare crash under -[WKWebView _web_immediateActionAnimationControllerForHitTestResultInternal...]
​https://bugs.webkit.org/show_bug.cgi?id=197404
<rdar://problem/24589331>

Reviewed by Wenson Hsieh.

• UIProcess/mac/WKImmediateActionController.mm:

(-[WKImmediateActionController _updateImmediateActionItem]):
(-[WKImmediateActionController menuItem:previewItemAtPoint:]):
(-[WKImmediateActionController menuItem:itemFrameForPoint:]):
(-[WKImmediateActionController _animationControllerForDataDetectedLink]):
Add some null checks; _webHitTestResult can be null if we (somehow) get
an immediate action gesture without having previously gotten a
mouseDidMoveOverElement from the Web Content process. Cover all our bases.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/mac/WKImmediateActionController.mm (modified) (4 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-04-30  Tim Horton  <timothy_horton@apple.com>
+
+        Long-standing rare crash under -[WKWebView _web_immediateActionAnimationControllerForHitTestResultInternal...]
+        https://bugs.webkit.org/show_bug.cgi?id=197404
+        <rdar://problem/24589331>
+
+        Reviewed by Wenson Hsieh.
+
+        * UIProcess/mac/WKImmediateActionController.mm:
+        (-[WKImmediateActionController _updateImmediateActionItem]):
+        (-[WKImmediateActionController menuItem:previewItemAtPoint:]):
+        (-[WKImmediateActionController menuItem:itemFrameForPoint:]):
+        (-[WKImmediateActionController _animationControllerForDataDetectedLink]):
+        Add some null checks; _webHitTestResult can be null if we (somehow) get
+        an immediate action gesture without having previously gotten a
+        mouseDidMoveOverElement from the Web Content process. Cover all our bases.
+
 2019-04-30  Per Arne Vollan  <pvollan@apple.com>
 

trunk/Source/WebKit/UIProcess/mac/WKImmediateActionController.mm

@@ -329 +329 @@
 
     RefPtr<API::HitTestResult> hitTestResult = [self _webHitTestResult];
+    if (!hitTestResult) {
+        [self _cancelImmediateAction];
+        return;
+    }
+
     id customClientAnimationController = _page->immediateActionAnimationControllerForHitTestResult(hitTestResult, _type, _userData);
     if (customClientAnimationController == [NSNull null]) {
@@ -354 +359 @@
 
     RefPtr<API::HitTestResult> hitTestResult = [self _webHitTestResult];
+    if (!hitTestResult)
+        return nil;
+
     return [NSURL _web_URLWithWTFString:hitTestResult->absoluteLinkURL()];
 }
@@ -373 +381 @@
 
     RefPtr<API::HitTestResult> hitTestResult = [self _webHitTestResult];
+    if (!hitTestResult)
+        return NSZeroRect;
+
     return [_view convertRect:hitTestResult->elementBoundingBox() toView:nil];
 }
@@ -450 +461 @@
 
     RefPtr<API::HitTestResult> hitTestResult = [self _webHitTestResult];
+    if (!hitTestResult)
+        return nil;
+
     NSArray *menuItems = [[getDDActionsManagerClass() sharedManager] menuItemsForTargetURL:hitTestResult->absoluteLinkURL() actionContext:_currentActionContext.get()];