Attachment 373356 Details for Bug 199394 – Patch

[patch] Patch

bug-199394-20190702134317.patch (text/plain), 4.41 KB, created by Tim Horton on 2019-07-02 13:43:17 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Horton

Created: 2019-07-02 13:43:17 PDT

Size: 4.41 KB

patch

obsolete

>Subversion Revision: 247031
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index c325a15413eabed66046e4987b8688d7b9ac9936..6f0d5e91eef92173b0548281bb934e577173dd5a 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,18 @@
>+2019-07-01  Tim Horton  <timothy_horton@apple.com>
>+
>+        REGRESSION (r243240): Unable to swipe back in Safari
>+        https://bugs.webkit.org/show_bug.cgi?id=199394
>+        <rdar://problem/51137447>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UIProcess/API/Cocoa/WKWebView.mm:
>+        (-[WKWebView _processDidExit]):
>+        r243240 started nilling out the ViewGestureController, but we don't actually
>+        expect that; the only time WKWebView's ViewGestureController goes away
>+        is if the client turns off the gestures... and so nothing ever puts it back.
>+        Instead, just always disconnect, don't nil it out.
>+
> 2019-07-01  Chris Dumez  <cdumez@apple.com>
> 
>         Remove virtual functions on WebProcessLifetimeObserver that are unused after r245540
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm b/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>index 921fb01a0e3486eab5b3b152d28d7a8adbbb3b56..9c247d66ceac34b07e885e426356b52570868f95 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>@@ -1848,6 +1848,9 @@ - (void)_processWillSwapOrDidExit
>     [self _hidePasswordView];
>     [self _cancelAnimatedResize];
> 
>+    if (_gestureController)
>+        _gestureController->disconnectFromProcess();
>+
>     _viewportMetaTagWidth = WebCore::ViewportArguments::ValueAuto;
>     _initialScaleFactor = 1;
>     _hasCommittedLoadForMainFrame = NO;
>@@ -1883,8 +1886,6 @@ - (void)_processWillSwap
> {
>     RELEASE_LOG_IF_ALLOWED("%p -[WKWebView _processWillSwap]", self);
>     [self _processWillSwapOrDidExit];
>-    if (_gestureController)
>-        _gestureController->disconnectFromProcess();
> }
> 
> - (void)_processDidExit
>@@ -1897,7 +1898,6 @@ - (void)_processDidExit
>     [_scrollView setBackgroundColor:[_contentView backgroundColor]];
>     [_scrollView setContentOffset:[self _initialContentOffsetForScrollView]];
>     [_scrollView setZoomScale:1];
>-    _gestureController = nullptr;
> }
> 
> - (void)_didRelaunchProcess
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 54929459bab8d23208efb4666e627e62f2e0de08..cbf3880049b88a7b4b08860b678ff47bb4852b8c 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-07-01  Tim Horton  <timothy_horton@apple.com>
>+
>+        REGRESSION (r243240): Unable to swipe back in Safari
>+        https://bugs.webkit.org/show_bug.cgi?id=199394
>+        <rdar://problem/51137447>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:
>+        Make sure that we actually end up with swipe gesture recognizers installed
>+        after process swap and crash.
>+
> 2019-07-01  Alex Christensen  <achristensen@webkit.org>
> 
>         Add new decidePolicyForNavigationAction SPI with preferences and userInfo
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm b/Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm
>index b532a6d3aa5f006bd3e4df1ccd7bc8c2de9d2b46..7872eb6b184ce03402361172d5a68a5ea8c24aef 100644
>--- a/Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm
>+++ b/Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm
>@@ -5350,6 +5350,19 @@ TEST(ProcessSwap, TerminateProcessAfterProcessSwap)
>     done = false;
> }
> 
>+#if PLATFORM(IOS_FAMILY)
>+static bool viewHasSwipeGestures(UIView *view)
>+{
>+    unsigned swipeGestureCount = 0;
>+    for (UIGestureRecognizer *recognizer in view.gestureRecognizers) {
>+        if ([recognizer isKindOfClass:NSClassFromString(@"UIScreenEdgePanGestureRecognizer")])
>+            swipeGestureCount++;
>+    }
>+
>+    return swipeGestureCount == 2;
>+}
>+#endif
>+
> TEST(ProcessSwap, SwapWithGestureController)
> {
>     @autoreleasepool {
>@@ -5383,6 +5396,10 @@ TEST(ProcessSwap, SwapWithGestureController)
> 
>         TestWebKitAPI::Util::run(&done);
>         done = false;
>+
>+#if PLATFORM(IOS_FAMILY)
>+        EXPECT_TRUE(viewHasSwipeGestures(webView.get()));
>+#endif
>     }
> }
> 
>@@ -5431,6 +5448,10 @@ TEST(ProcessSwap, CrashWithGestureController)
>         [webView reload];
>         TestWebKitAPI::Util::run(&done);
>         done = false;
>+
>+#if PLATFORM(IOS_FAMILY)
>+        EXPECT_TRUE(viewHasSwipeGestures(webView.get()));
>+#endif
>     }
> }
>

Actions: View | Formatted Diff | Diff

Attachments on bug 199394: 373302 | 373356