Changeset 217956 in webkit

Timestamp:

Jun 8, 2017, 5:46:38 PM (9 years ago)

Author:

Simon Fraser

Message:

Crash under -[WKWebView _updateVisibleContentRects]
​https://bugs.webkit.org/show_bug.cgi?id=173123
rdar://problem/32650112

Reviewed by Tim Horton.

Make sure the WKWebView is valid in places where we dispatch_async or use
a pre-commit handler.

Speculative fix for a rare crasher.

• UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView _isValid]):
(-[WKWebView _addUpdateVisibleContentRectPreCommitHandler]):
(-[WKWebView _scheduleVisibleContentRectUpdateAfterScrollInView:]):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebView.mm (modified) (4 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-06-08  Simon Fraser  <simon.fraser@apple.com>
+
+        Crash under -[WKWebView _updateVisibleContentRects]
+        https://bugs.webkit.org/show_bug.cgi?id=173123
+        rdar://problem/32650112
+
+        Reviewed by Tim Horton.
+
+        Make sure the WKWebView is valid in places where we dispatch_async or use
+        a pre-commit handler.
+
+        Speculative fix for a rare crasher.
+
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView _isValid]):
+        (-[WKWebView _addUpdateVisibleContentRectPreCommitHandler]):
+        (-[WKWebView _scheduleVisibleContentRectUpdateAfterScrollInView:]):
+
 2017-06-07  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

@@ -317 +317 @@
 }
 
+- (BOOL)_isValid
+{
+    return _page && _page->isValid();
+}
+
 #if PLATFORM(IOS)
 static int32_t deviceOrientationForUIInterfaceOrientation(UIInterfaceOrientation orientation)
@@ -2354 +2359 @@
     [CATransaction addCommitHandler:[retainedSelf] {
         WKWebView *webView = retainedSelf.get();
+        if (![webView _isValid])
+            return;
         [webView _updateVisibleContentRects];
         webView->_hasScheduledVisibleRectUpdate = NO;
@@ -2378 +2385 @@
     dispatch_async(dispatch_get_main_queue(), [retainedSelf = retainPtr(self)] {
         WKWebView *webView = retainedSelf.get();
+        if (![webView _isValid])
+            return;
         [webView _addUpdateVisibleContentRectPreCommitHandler];
     });
@@ -3789 +3798 @@
 - (pid_t)_webProcessIdentifier
 {
-    return _page->isValid() ? _page->processIdentifier() : 0;
+    if (![self _isValid])
+        return 0;
+
+    return _page->processIdentifier();
 }
 
 - (void)_killWebContentProcess
 {
-    if (!_page->isValid())
+    if (![self _isValid])
         return;