- Revision
- 255013
- Author
- [email protected]
- Date
- 2020-01-23 13:43:43 -0800 (Thu, 23 Jan 2020)
Log Message
Cherry-pick r254552. rdar://problem/58812968
REGRESSION (r253394): After swiping back during a navigation, WKWebView gets stuck with the forward content, stops repainting
https://bugs.webkit.org/show_bug.cgi?id=206268
<rdar://problem/58536702>
Reviewed by Simon Fraser.
* UIProcess/ViewGestureController.cpp:
(WebKit::ViewGestureController::endSwipeGesture):
* UIProcess/ViewGestureController.h:
* UIProcess/ios/ViewGestureControllerIOS.mm:
(WebKit::ViewGestureController::beginSwipeGesture):
(WebKit::ViewGestureController::endSwipeGesture):
(WebKit::ViewGestureController::removeSwipeSnapshot):
* UIProcess/mac/ViewGestureControllerMac.mm:
(WebKit::ViewGestureController::beginSwipeGesture):
(WebKit::ViewGestureController::removeSwipeSnapshot):
After r253394, we start loading the destination page in willEndSwipeGesture,
when we know the gesture will complete, instead of in endSwipeGesture,
when it is actually done.
This means that if we decide that we should tear down the snapshot immediately,
this can now happen in the window between willEndSwipeGesture and endSwipeGesture.
However, removeSwipeSnapshot has numerous dependencies on endSwipeGesture
(especially on iOS, where there are /also/ dependencies in the other direction -
endSwipeGesture will never be called after removeSwipeSnapshot because
of the gestureID mismatch).
Regardless, it does not make sense to remove the snapshot while the animation
is still running. So, if something causes removeSwipeSnapshot to be called
before endSwipeGesture, we just set a bit and call it inside endSwipeGesture instead.
This ends up putting the snapshot removal ordering back as it was before r253394.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254552 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-609-branch/Source/WebKit/ChangeLog (255012 => 255013)
--- branches/safari-609-branch/Source/WebKit/ChangeLog 2020-01-23 21:43:40 UTC (rev 255012)
+++ branches/safari-609-branch/Source/WebKit/ChangeLog 2020-01-23 21:43:43 UTC (rev 255013)
@@ -1,5 +1,82 @@
2020-01-23 Russell Epstein <[email protected]>
+ Cherry-pick r254552. rdar://problem/58812968
+
+ REGRESSION (r253394): After swiping back during a navigation, WKWebView gets stuck with the forward content, stops repainting
+ https://bugs.webkit.org/show_bug.cgi?id=206268
+ <rdar://problem/58536702>
+
+ Reviewed by Simon Fraser.
+
+ * UIProcess/ViewGestureController.cpp:
+ (WebKit::ViewGestureController::endSwipeGesture):
+ * UIProcess/ViewGestureController.h:
+ * UIProcess/ios/ViewGestureControllerIOS.mm:
+ (WebKit::ViewGestureController::beginSwipeGesture):
+ (WebKit::ViewGestureController::endSwipeGesture):
+ (WebKit::ViewGestureController::removeSwipeSnapshot):
+ * UIProcess/mac/ViewGestureControllerMac.mm:
+ (WebKit::ViewGestureController::beginSwipeGesture):
+ (WebKit::ViewGestureController::removeSwipeSnapshot):
+ After r253394, we start loading the destination page in willEndSwipeGesture,
+ when we know the gesture will complete, instead of in endSwipeGesture,
+ when it is actually done.
+
+ This means that if we decide that we should tear down the snapshot immediately,
+ this can now happen in the window between willEndSwipeGesture and endSwipeGesture.
+
+ However, removeSwipeSnapshot has numerous dependencies on endSwipeGesture
+ (especially on iOS, where there are /also/ dependencies in the other direction -
+ endSwipeGesture will never be called after removeSwipeSnapshot because
+ of the gestureID mismatch).
+
+ Regardless, it does not make sense to remove the snapshot while the animation
+ is still running. So, if something causes removeSwipeSnapshot to be called
+ before endSwipeGesture, we just set a bit and call it inside endSwipeGesture instead.
+
+ This ends up putting the snapshot removal ordering back as it was before r253394.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254552 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-01-14 Tim Horton <[email protected]>
+
+ REGRESSION (r253394): After swiping back during a navigation, WKWebView gets stuck with the forward content, stops repainting
+ https://bugs.webkit.org/show_bug.cgi?id=206268
+ <rdar://problem/58536702>
+
+ Reviewed by Simon Fraser.
+
+ * UIProcess/ViewGestureController.cpp:
+ (WebKit::ViewGestureController::endSwipeGesture):
+ * UIProcess/ViewGestureController.h:
+ * UIProcess/ios/ViewGestureControllerIOS.mm:
+ (WebKit::ViewGestureController::beginSwipeGesture):
+ (WebKit::ViewGestureController::endSwipeGesture):
+ (WebKit::ViewGestureController::removeSwipeSnapshot):
+ * UIProcess/mac/ViewGestureControllerMac.mm:
+ (WebKit::ViewGestureController::beginSwipeGesture):
+ (WebKit::ViewGestureController::removeSwipeSnapshot):
+ After r253394, we start loading the destination page in willEndSwipeGesture,
+ when we know the gesture will complete, instead of in endSwipeGesture,
+ when it is actually done.
+
+ This means that if we decide that we should tear down the snapshot immediately,
+ this can now happen in the window between willEndSwipeGesture and endSwipeGesture.
+
+ However, removeSwipeSnapshot has numerous dependencies on endSwipeGesture
+ (especially on iOS, where there are /also/ dependencies in the other direction -
+ endSwipeGesture will never be called after removeSwipeSnapshot because
+ of the gestureID mismatch).
+
+ Regardless, it does not make sense to remove the snapshot while the animation
+ is still running. So, if something causes removeSwipeSnapshot to be called
+ before endSwipeGesture, we just set a bit and call it inside endSwipeGesture instead.
+
+ This ends up putting the snapshot removal ordering back as it was before r253394.
+
+2020-01-23 Russell Epstein <[email protected]>
+
Cherry-pick r254550. rdar://problem/58812988
REGRESSION(iOS 13): createMediaElementSource not working
Modified: branches/safari-609-branch/Source/WebKit/UIProcess/ViewGestureController.cpp (255012 => 255013)
--- branches/safari-609-branch/Source/WebKit/UIProcess/ViewGestureController.cpp 2020-01-23 21:43:40 UTC (rev 255012)
+++ branches/safari-609-branch/Source/WebKit/UIProcess/ViewGestureController.cpp 2020-01-23 21:43:43 UTC (rev 255013)
@@ -605,6 +605,8 @@
m_swipeCancellationTracker = nullptr;
#endif
+ m_didCallEndSwipeGesture = true;
+
if (cancelled) {
removeSwipeSnapshot();
m_webPageProxy.navigationGestureDidEnd(false, *targetItem);
@@ -614,6 +616,13 @@
m_webPageProxy.navigationGestureDidEnd(true, *targetItem);
m_snapshotRemovalTracker.eventOccurred(SnapshotRemovalTracker::SwipeAnimationEnd, SnapshotRemovalTracker::ShouldIgnoreEventIfPaused::No);
+
+ // removeSwipeSnapshot() was called between willEndSwipeGesture() and endSwipeGesture().
+ // We couldn't remove it then, because the animation was still running, but now we can!
+ if (m_removeSnapshotImmediatelyWhenGestureEnds) {
+ removeSwipeSnapshot();
+ return;
+ }
}
void ViewGestureController::requestRenderTreeSizeNotificationIfNeeded()
Modified: branches/safari-609-branch/Source/WebKit/UIProcess/ViewGestureController.h (255012 => 255013)
--- branches/safari-609-branch/Source/WebKit/UIProcess/ViewGestureController.h 2020-01-23 21:43:40 UTC (rev 255012)
+++ branches/safari-609-branch/Source/WebKit/UIProcess/ViewGestureController.h 2020-01-23 21:43:43 UTC (rev 255013)
@@ -435,6 +435,9 @@
bool m_isConnectedToProcess { false };
bool m_didStartProvisionalLoad { false };
+ bool m_didCallEndSwipeGesture { false };
+ bool m_removeSnapshotImmediatelyWhenGestureEnds { false };
+
SnapshotRemovalTracker m_snapshotRemovalTracker;
WTF::Function<void()> m_loadCallback;
};
Modified: branches/safari-609-branch/Source/WebKit/UIProcess/ios/ViewGestureControllerIOS.mm (255012 => 255013)
--- branches/safari-609-branch/Source/WebKit/UIProcess/ios/ViewGestureControllerIOS.mm 2020-01-23 21:43:40 UTC (rev 255012)
+++ branches/safari-609-branch/Source/WebKit/UIProcess/ios/ViewGestureControllerIOS.mm 2020-01-23 21:43:43 UTC (rev 255013)
@@ -258,6 +258,8 @@
[m_swipeTransitionContext _setInteractor:transition];
[m_swipeTransitionContext _setTransitionIsInFlight:YES];
m_didCallWillEndSwipeGesture = false;
+ m_didCallEndSwipeGesture = false;
+ m_removeSnapshotImmediatelyWhenGestureEnds = false;
[m_swipeTransitionContext _setInteractiveUpdateHandler:^(BOOL finish, CGFloat percent, BOOL transitionCompleted, _UIViewControllerTransitionContext *) {
if (finish)
willEndSwipeGesture(*targetItem, !transitionCompleted);
@@ -316,6 +318,8 @@
if (!m_didCallWillEndSwipeGesture)
willEndSwipeGesture(*targetItem, cancelled);
+ m_didCallEndSwipeGesture = true;
+
[context _setTransitionIsInFlight:NO];
[context _setInteractor:nil];
[context _setAnimator:nil];
@@ -346,6 +350,13 @@
return;
}
+ // removeSwipeSnapshot() was called between willEndSwipeGesture() and endSwipeGesture().
+ // We couldn't remove it then, because the animation was still running, but now we can!
+ if (m_removeSnapshotImmediatelyWhenGestureEnds) {
+ removeSwipeSnapshot();
+ return;
+ }
+
auto pageID = m_webPageProxy.identifier();
GestureID gestureID = m_currentGestureID;
@@ -398,6 +409,11 @@
if (m_activeGestureType != ViewGestureType::Swipe)
return;
+ if (!m_didCallEndSwipeGesture) {
+ m_removeSnapshotImmediatelyWhenGestureEnds = true;
+ return;
+ }
+
[m_snapshotView removeFromSuperview];
m_snapshotView = nullptr;
Modified: branches/safari-609-branch/Source/WebKit/UIProcess/mac/ViewGestureControllerMac.mm (255012 => 255013)
--- branches/safari-609-branch/Source/WebKit/UIProcess/mac/ViewGestureControllerMac.mm 2020-01-23 21:43:40 UTC (rev 255012)
+++ branches/safari-609-branch/Source/WebKit/UIProcess/mac/ViewGestureControllerMac.mm 2020-01-23 21:43:43 UTC (rev 255013)
@@ -467,6 +467,9 @@
if (m_webPageProxy.preferences().viewGestureDebuggingEnabled())
applyDebuggingPropertiesToSwipeViews();
+ m_didCallEndSwipeGesture = false;
+ m_removeSnapshotImmediatelyWhenGestureEnds = false;
+
CALayer *layerAdjacentToSnapshot = determineLayerAdjacentToSnapshotForParent(direction, snapshotLayerParent);
BOOL swipingLeft = isPhysicallySwipingLeft(direction);
if (swipingLeft)
@@ -599,6 +602,11 @@
if (m_activeGestureType != ViewGestureType::Swipe)
return;
+ if (!m_didCallEndSwipeGesture) {
+ m_removeSnapshotImmediatelyWhenGestureEnds = true;
+ return;
+ }
+
if (m_currentSwipeSnapshot)
m_currentSwipeSnapshot->setVolatile(true);
m_currentSwipeSnapshot = nullptr;
