<!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>[211185] branches/safari-603-branch/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/211185">211185</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-01-25 17:40:52 -0800 (Wed, 25 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/211121">r211121</a>. rdar://problem/22938927</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchSourceWebKit2ChangeLog">branches/safari-603-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebKit2PlatformspiiosUIKitSPIh">branches/safari-603-branch/Source/WebKit2/Platform/spi/ios/UIKitSPI.h</a></li>
<li><a href="#branchessafari603branchSourceWebKit2UIProcessAPICocoaWKWebViewmm">branches/safari-603-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#branchessafari603branchSourceWebKit2UIProcessAPICocoaWKWebViewInternalh">branches/safari-603-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h</a></li>
<li><a href="#branchessafari603branchSourceWebKit2UIProcessCocoaViewGestureControllerh">branches/safari-603-branch/Source/WebKit2/UIProcess/Cocoa/ViewGestureController.h</a></li>
<li><a href="#branchessafari603branchSourceWebKit2UIProcessiosViewGestureControllerIOSmm">branches/safari-603-branch/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm</a></li>
<li><a href="#branchessafari603branchSourceWebKit2UIProcessiosWKContentViewInteractionmm">branches/safari-603-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (211184 => 211185)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-26 01:40:48 UTC (rev 211184)
+++ branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-26 01:40:52 UTC (rev 211185)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2017-01-25 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r211121. rdar://problem/22938927
+
+ 2017-01-24 Tim Horton <timothy_horton@apple.com>
+
+ Script gets touch events even after navigation swipe begins
+ https://bugs.webkit.org/show_bug.cgi?id=167383
+ <rdar://problem/22938927>
+
+ Reviewed by Simon Fraser.
+
+ * Platform/spi/ios/UIKitSPI.h:
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _isNavigationSwipeGestureRecognizer:]):
+ * UIProcess/API/Cocoa/WKWebViewInternal.h:
+ * UIProcess/Cocoa/ViewGestureController.h:
+ * UIProcess/ios/ViewGestureControllerIOS.mm:
+ (-[WKSwipeTransitionController isNavigationSwipeGestureRecognizer:]):
+ (WebKit::ViewGestureController::isNavigationSwipeGestureRecognizer):
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView gestureRecognizer:shouldRequireFailureOfGestureRecognizer:]):
+ Require the navigation swipe gesture recognizer to fail before the
+ UIWebTouchEventsGestureRecognizer can recognize. This way, the page
+ doesn't get touch events during the swipe, which previously led to
+ e.g. carousels scrolling while swiping.
+
</ins><span class="cx"> 2017-01-25 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Disable Variation fonts on this branch.
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2PlatformspiiosUIKitSPIh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/Platform/spi/ios/UIKitSPI.h (211184 => 211185)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/Platform/spi/ios/UIKitSPI.h 2017-01-26 01:40:48 UTC (rev 211184)
+++ branches/safari-603-branch/Source/WebKit2/Platform/spi/ios/UIKitSPI.h 2017-01-26 01:40:52 UTC (rev 211185)
</span><span class="lines">@@ -742,6 +742,7 @@
</span><span class="cx">
</span><span class="cx"> @interface _UINavigationInteractiveTransitionBase ()
</span><span class="cx"> - (id)initWithGestureRecognizerView:(UIView *)gestureRecognizerView animator:(id<UIViewControllerAnimatedTransitioning>)animator delegate:(id<_UINavigationInteractiveTransitionBaseDelegate>)delegate;
</span><ins>+@property (nonatomic, weak) UIPanGestureRecognizer *gestureRecognizer;
</ins><span class="cx"> @property (nonatomic, assign) BOOL shouldReverseTranslation;
</span><span class="cx"> @property (nonatomic, retain) _UINavigationParallaxTransition *animationController;
</span><span class="cx"> @end
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (211184 => 211185)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2017-01-26 01:40:48 UTC (rev 211184)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2017-01-26 01:40:52 UTC (rev 211185)
</span><span class="lines">@@ -2304,6 +2304,13 @@
</span><span class="cx"> return _allowsBackForwardNavigationGestures;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)_isNavigationSwipeGestureRecognizer:(UIGestureRecognizer *)recognizer
+{
+ if (!_gestureController)
+ return NO;
+ return _gestureController->isNavigationSwipeGestureRecognizer(recognizer);
+}
+
</ins><span class="cx"> - (void)_navigationGestureDidBegin
</span><span class="cx"> {
</span><span class="cx"> // During a back/forward swipe, there's a view interposed between this view and the content view that has
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2UIProcessAPICocoaWKWebViewInternalh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h (211184 => 211185)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h 2017-01-26 01:40:48 UTC (rev 211184)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h 2017-01-26 01:40:52 UTC (rev 211185)
</span><span class="lines">@@ -114,6 +114,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)_navigationGestureDidBegin;
</span><span class="cx"> - (void)_navigationGestureDidEnd;
</span><ins>+- (BOOL)_isNavigationSwipeGestureRecognizer:(UIGestureRecognizer *)recognizer;
</ins><span class="cx">
</span><span class="cx"> @property (nonatomic, readonly) BOOL _isBackground;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2UIProcessCocoaViewGestureControllerh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/Cocoa/ViewGestureController.h (211184 => 211185)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/UIProcess/Cocoa/ViewGestureController.h 2017-01-26 01:40:48 UTC (rev 211184)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/Cocoa/ViewGestureController.h 2017-01-26 01:40:52 UTC (rev 211185)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> OBJC_CLASS CALayer;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><ins>+OBJC_CLASS UIGestureRecognizer;
</ins><span class="cx"> OBJC_CLASS UIView;
</span><span class="cx"> OBJC_CLASS WKSwipeTransitionController;
</span><span class="cx"> OBJC_CLASS _UINavigationInteractiveTransitionBase;
</span><span class="lines">@@ -105,6 +106,7 @@
</span><span class="cx">
</span><span class="cx"> bool isPhysicallySwipingLeft(SwipeDirection) const;
</span><span class="cx"> #else
</span><ins>+ bool isNavigationSwipeGestureRecognizer(UIGestureRecognizer *) const;
</ins><span class="cx"> void installSwipeHandler(UIView *gestureRecognizerView, UIView *swipingView);
</span><span class="cx"> void beginSwipeGesture(_UINavigationInteractiveTransitionBase *, SwipeDirection);
</span><span class="cx"> void endSwipeGesture(WebBackForwardListItem* targetItem, _UIViewControllerTransitionContext *, bool cancelled);
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2UIProcessiosViewGestureControllerIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm (211184 => 211185)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm 2017-01-26 01:40:48 UTC (rev 211184)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm 2017-01-26 01:40:52 UTC (rev 211185)
</span><span class="lines">@@ -129,6 +129,11 @@
</span><span class="cx"> return [recognizer autorelease];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)isNavigationSwipeGestureRecognizer:(UIGestureRecognizer *)recognizer
+{
+ return recognizer == [_backTransitionController gestureRecognizer] || recognizer == [_forwardTransitionController gestureRecognizer];
+}
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -141,6 +146,11 @@
</span><span class="cx"> [m_swipeInteractiveTransitionDelegate invalidate];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool ViewGestureController::isNavigationSwipeGestureRecognizer(UIGestureRecognizer *recognizer) const
+{
+ return [m_swipeInteractiveTransitionDelegate isNavigationSwipeGestureRecognizer:recognizer];
+}
+
</ins><span class="cx"> void ViewGestureController::installSwipeHandler(UIView *gestureRecognizerView, UIView *swipingView)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_swipeInteractiveTransitionDelegate);
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (211184 => 211185)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2017-01-26 01:40:48 UTC (rev 211184)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2017-01-26 01:40:52 UTC (rev 211185)
</span><span class="lines">@@ -1193,6 +1193,14 @@
</span><span class="cx"> return NO;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRequireFailureOfGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer
+{
+ if (gestureRecognizer == _touchEventGestureRecognizer && [_webView _isNavigationSwipeGestureRecognizer:otherGestureRecognizer])
+ return YES;
+
+ return NO;
+}
+
</ins><span class="cx"> - (void)_showImageSheet
</span><span class="cx"> {
</span><span class="cx"> [_actionSheetAssistant showImageSheet];
</span></span></pre>
</div>
</div>
</body>
</html>