<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[163795] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/163795">163795</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-02-10 10:09:55 -0800 (Mon, 10 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS][wk2] WebKit2 View Gestures (Swipe): Forward swipe gesture
https://bugs.webkit.org/show_bug.cgi?id=128523
<rdar://problem/16020378>
Reviewed by Darin Adler.
We can't install the gesture recognizer on a view that's going to be
reparented during the swipe, because the gesture will be cancelled.
Install the recognizer on the WKView and move the WKView's scrollview
child around instead.
* UIProcess/API/ios/WKViewIOS.mm:
(-[WKView setAllowsBackForwardNavigationGestures:]):
We'll install the gesture recognizer on the WKView, but swipe the scrollview.
* UIProcess/ios/ViewGestureControllerIOS.mm:
(-[WKSwipeTransitionController initWithViewGestureController:gestureRecognizerView:]):
Clarify that WKSwipeTransitionController gets handed only the view to install the gesture recognizer on.
(-[WKSwipeTransitionController gestureRecognizerForInteractiveTransition:WithTarget:action:]):
Use public enum values so we can get rid of one private header.
(WebKit::ViewGestureController::installSwipeHandler):
Separate out the gesture recognizer view from the one that gets swiped.
(WebKit::ViewGestureController::beginSwipeGesture):
Record a snapshot before beginning the swipe. This is important for the back-then-forward
swipe case, and matches the behavior of the Mac implementation.
(WebKit::ViewGestureController::endSwipeGesture):
* UIProcess/mac/ViewGestureController.h:
Slight geometry adjustments due to the change in targetted view.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIiosWKViewIOSmm">trunk/Source/WebKit2/UIProcess/API/ios/WKViewIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosViewGestureControllerIOSmm">trunk/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacViewGestureControllerh">trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (163794 => 163795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-10 18:02:59 UTC (rev 163794)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-10 18:09:55 UTC (rev 163795)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2014-02-10 Tim Horton <timothy_horton@apple.com>
+
+ [iOS][wk2] WebKit2 View Gestures (Swipe): Forward swipe gesture
+ https://bugs.webkit.org/show_bug.cgi?id=128523
+ <rdar://problem/16020378>
+
+ Reviewed by Darin Adler.
+
+ We can't install the gesture recognizer on a view that's going to be
+ reparented during the swipe, because the gesture will be cancelled.
+ Install the recognizer on the WKView and move the WKView's scrollview
+ child around instead.
+
+ * UIProcess/API/ios/WKViewIOS.mm:
+ (-[WKView setAllowsBackForwardNavigationGestures:]):
+ We'll install the gesture recognizer on the WKView, but swipe the scrollview.
+
+ * UIProcess/ios/ViewGestureControllerIOS.mm:
+ (-[WKSwipeTransitionController initWithViewGestureController:gestureRecognizerView:]):
+ Clarify that WKSwipeTransitionController gets handed only the view to install the gesture recognizer on.
+ (-[WKSwipeTransitionController gestureRecognizerForInteractiveTransition:WithTarget:action:]):
+ Use public enum values so we can get rid of one private header.
+
+ (WebKit::ViewGestureController::installSwipeHandler):
+ Separate out the gesture recognizer view from the one that gets swiped.
+
+ (WebKit::ViewGestureController::beginSwipeGesture):
+ Record a snapshot before beginning the swipe. This is important for the back-then-forward
+ swipe case, and matches the behavior of the Mac implementation.
+
+ (WebKit::ViewGestureController::endSwipeGesture):
+ * UIProcess/mac/ViewGestureController.h:
+ Slight geometry adjustments due to the change in targetted view.
+
</ins><span class="cx"> 2014-02-10 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> JSC environment variables should override other mechanisms for setting options
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIiosWKViewIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/ios/WKViewIOS.mm (163794 => 163795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/ios/WKViewIOS.mm 2014-02-10 18:02:59 UTC (rev 163794)
+++ trunk/Source/WebKit2/UIProcess/API/ios/WKViewIOS.mm 2014-02-10 18:09:55 UTC (rev 163795)
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx">
</span><span class="cx"> if (allowsBackForwardNavigationGestures && !_gestureController) {
</span><span class="cx"> _gestureController = std::make_unique<ViewGestureController>(*webPageProxy);
</span><del>- _gestureController->installSwipeHandler(self);
</del><ins>+ _gestureController->installSwipeHandler(self, [self scrollView]);
</ins><span class="cx"> } else
</span><span class="cx"> _gestureController = nullptr;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosViewGestureControllerIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm (163794 => 163795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm 2014-02-10 18:02:59 UTC (rev 163794)
+++ trunk/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm 2014-02-10 18:09:55 UTC (rev 163795)
</span><span class="lines">@@ -35,7 +35,6 @@
</span><span class="cx"> #import "WebPageProxy.h"
</span><span class="cx"> #import "WebProcessProxy.h"
</span><span class="cx"> #import <QuartzCore/QuartzCore.h>
</span><del>-#import <UIKit/UIApplication_Private.h>
</del><span class="cx"> #import <UIKit/UIScreenEdgePanGestureRecognizer.h>
</span><span class="cx"> #import <UIKit/UIViewControllerTransitioning_Private.h>
</span><span class="cx"> #import <UIKit/UIWebTouchEventsGestureRecognizer.h>
</span><span class="lines">@@ -50,26 +49,31 @@
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> @interface WKSwipeTransitionController : NSObject <_UINavigationInteractiveTransitionBaseDelegate>
</span><del>-- (instancetype)initWithViewGestureController:(WebKit::ViewGestureController*)gestureController swipingView:(UIView *)view;
</del><ins>+- (instancetype)initWithViewGestureController:(WebKit::ViewGestureController*)gestureController gestureRecognizerView:(UIView *)gestureRecognizerView;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @implementation WKSwipeTransitionController
</span><span class="cx"> {
</span><span class="cx"> WebKit::ViewGestureController *_gestureController;
</span><span class="cx"> RetainPtr<_UINavigationInteractiveTransitionBase> _backTransitionController;
</span><ins>+ RetainPtr<_UINavigationInteractiveTransitionBase> _forwardTransitionController;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static const float swipeSnapshotRemovalRenderTreeSizeTargetFraction = 0.5;
</span><span class="cx"> static const std::chrono::seconds swipeSnapshotRemovalWatchdogDuration = 3_s;
</span><span class="cx">
</span><del>-- (instancetype)initWithViewGestureController:(WebKit::ViewGestureController*)gestureController swipingView:(UIView *)view
</del><ins>+- (instancetype)initWithViewGestureController:(WebKit::ViewGestureController*)gestureController gestureRecognizerView:(UIView *)gestureRecognizerView
</ins><span class="cx"> {
</span><span class="cx"> self = [super init];
</span><span class="cx"> if (self) {
</span><span class="cx"> _gestureController = gestureController;
</span><span class="cx">
</span><span class="cx"> _backTransitionController = adoptNS([_UINavigationInteractiveTransitionBase alloc]);
</span><del>- _backTransitionController = [_backTransitionController initWithGestureRecognizerView:view animator:nil delegate:self];
</del><ins>+ _backTransitionController = [_backTransitionController initWithGestureRecognizerView:gestureRecognizerView animator:nil delegate:self];
+
+ _forwardTransitionController = adoptNS([_UINavigationInteractiveTransitionBase alloc]);
+ _forwardTransitionController = [_forwardTransitionController initWithGestureRecognizerView:gestureRecognizerView animator:nil delegate:self];
+ [_forwardTransitionController setShouldReverseTranslation:YES];
</ins><span class="cx"> }
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="lines">@@ -104,10 +108,10 @@
</span><span class="cx"> UIScreenEdgePanGestureRecognizer *recognizer = [[UIScreenEdgePanGestureRecognizer alloc] initWithTarget:target action:action];
</span><span class="cx"> switch ([self directionForTransition:transition]) {
</span><span class="cx"> case WebKit::ViewGestureController::SwipeDirection::Left:
</span><del>- [recognizer setEdges:UIMinXEdge];
</del><ins>+ [recognizer setEdges:UIRectEdgeLeft];
</ins><span class="cx"> break;
</span><span class="cx"> case WebKit::ViewGestureController::SwipeDirection::Right:
</span><del>- [recognizer setEdges:UIMaxXEdge];
</del><ins>+ [recognizer setEdges:UIRectEdgeRight];
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> return recognizer;
</span><span class="lines">@@ -129,24 +133,26 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ViewGestureController::installSwipeHandler(UIView *view)
</del><ins>+void ViewGestureController::installSwipeHandler(UIView *gestureRecognizerView, UIView *swipingView)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!m_swipeInteractiveTransitionDelegate);
</span><del>- m_swipeInteractiveTransitionDelegate = adoptNS([[WKSwipeTransitionController alloc] initWithViewGestureController:this swipingView:view]);
- m_liveSwipeView = view;
</del><ins>+ m_swipeInteractiveTransitionDelegate = adoptNS([[WKSwipeTransitionController alloc] initWithViewGestureController:this gestureRecognizerView:gestureRecognizerView]);
+ m_liveSwipeView = swipingView;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ViewGestureController::beginSwipeGesture(_UINavigationInteractiveTransitionBase *transition, SwipeDirection direction)
</span><span class="cx"> {
</span><span class="cx"> if (m_activeGestureType != ViewGestureType::None)
</span><span class="cx"> return;
</span><ins>+
+ ViewSnapshotStore::shared().recordSnapshot(m_webPageProxy);
</ins><span class="cx">
</span><span class="cx"> WebKit::WebBackForwardListItem* targetItem = direction == SwipeDirection::Left ? m_webPageProxy.backForwardList().backItem() : m_webPageProxy.backForwardList().forwardItem();
</span><span class="cx">
</span><span class="cx"> auto snapshot = WebKit::ViewSnapshotStore::shared().snapshotAndRenderTreeSize(targetItem).first;
</span><span class="cx">
</span><span class="cx"> RetainPtr<UIViewController> snapshotViewController = adoptNS([[UIViewController alloc] init]);
</span><del>- m_snapshotView = adoptNS([[UIView alloc] initWithFrame:[m_liveSwipeView bounds]]);
</del><ins>+ m_snapshotView = adoptNS([[UIView alloc] initWithFrame:[m_liveSwipeView frame]]);
</ins><span class="cx"> if (snapshot) {
</span><span class="cx"> #if USE(IOSURFACE)
</span><span class="cx"> uint32_t purgeabilityState = kIOSurfacePurgeableNonVolatile;
</span><span class="lines">@@ -171,9 +177,6 @@
</span><span class="cx"> RetainPtr<UIViewController> targettedViewController = adoptNS([[UIViewController alloc] init]);
</span><span class="cx"> [targettedViewController setView:m_liveSwipeView];
</span><span class="cx">
</span><del>- m_originalLiveSwipeViewFrame = m_liveSwipeView.frame;
- m_liveSwipeView.frame = m_liveSwipeView.bounds;
-
</del><span class="cx"> UINavigationControllerOperation transitionOperation = direction == SwipeDirection::Left ? UINavigationControllerOperationPop : UINavigationControllerOperationPush;
</span><span class="cx"> RetainPtr<_UINavigationParallaxTransition> animationController = adoptNS([[_UINavigationParallaxTransition alloc] initWithCurrentOperation:transitionOperation]);
</span><span class="cx">
</span><span class="lines">@@ -181,8 +184,8 @@
</span><span class="cx"> [transitionContext _setFromViewController:targettedViewController.get()];
</span><span class="cx"> [transitionContext _setToViewController:snapshotViewController.get()];
</span><span class="cx"> [transitionContext _setContainerView:m_transitionContainerView.get()];
</span><del>- [transitionContext _setFromStartFrame:[m_liveSwipeView bounds]];
- [transitionContext _setToEndFrame:[m_liveSwipeView bounds]];
</del><ins>+ [transitionContext _setFromStartFrame:[m_liveSwipeView frame]];
+ [transitionContext _setToEndFrame:[m_liveSwipeView frame]];
</ins><span class="cx"> [transitionContext _setToStartFrame:CGRectZero];
</span><span class="cx"> [transitionContext _setFromEndFrame:CGRectZero];
</span><span class="cx"> [transitionContext _setAnimator:animationController.get()];
</span><span class="lines">@@ -214,9 +217,6 @@
</span><span class="cx"> [m_transitionContainerView removeFromSuperview];
</span><span class="cx"> m_transitionContainerView = nullptr;
</span><span class="cx">
</span><del>- [m_liveSwipeView setFrame:m_originalLiveSwipeViewFrame];
- [m_snapshotView setFrame:m_originalLiveSwipeViewFrame];
-
</del><span class="cx"> if (cancelled) {
</span><span class="cx"> removeSwipeSnapshot();
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacViewGestureControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.h (163794 => 163795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.h 2014-02-10 18:02:59 UTC (rev 163794)
+++ trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.h 2014-02-10 18:09:55 UTC (rev 163795)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx">
</span><span class="cx"> void endActiveGesture();
</span><span class="cx"> #else
</span><del>- void installSwipeHandler(UIView *);
</del><ins>+ void installSwipeHandler(UIView *gestureRecognizerView, UIView *swipingView);
</ins><span class="cx"> bool canSwipeInDirection(SwipeDirection);
</span><span class="cx"> void beginSwipeGesture(_UINavigationInteractiveTransitionBase *, SwipeDirection);
</span><span class="cx"> void endSwipeGesture(WebBackForwardListItem* targetItem, _UIViewControllerTransitionContext *, bool cancelled);
</span><span class="lines">@@ -144,9 +144,7 @@
</span><span class="cx"> // the scroll event that would have started a swipe, we'll fill these in.
</span><span class="cx"> bool m_hasPendingSwipe;
</span><span class="cx"> SwipeDirection m_pendingSwipeDirection;
</span><del>-#else
- CGRect m_originalLiveSwipeViewFrame;
-
</del><ins>+#else
</ins><span class="cx"> UIView *m_liveSwipeView;
</span><span class="cx"> RetainPtr<UIView> m_snapshotView;
</span><span class="cx"> RetainPtr<UIView> m_transitionContainerView;
</span></span></pre>
</div>
</div>
</body>
</html>