Changeset 245915 in webkit

Timestamp:

May 30, 2019, 5:29:35 PM (7 years ago)

Author:

Alan Coon

Message:

Cherry-pick r244781. rdar://problem/51264871

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.

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@244781 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-607-branch/Source/WebKit

Files:

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

branches/safari-607-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2019-05-30  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Cherry-pick r244781. rdar://problem/51264871
+
+    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.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@244781 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    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-05-14  Kocsen Chung  <kocsen_chung@apple.com>
 

branches/safari-607-branch/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()];