<!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>[167766] 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/167766">167766</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-04-24 10:48:28 -0700 (Thu, 24 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[wk2] Provide SPI allowing clients to hand events directly to swipe code, bypassing scrolling
https://bugs.webkit.org/show_bug.cgi?id=132092
<rdar://problem/15948244>
Reviewed by Darin Adler.
* UIProcess/API/Cocoa/WKViewPrivate.h:
* UIProcess/API/mac/WKView.mm:
(-[WKView _tryToSwipeWithEvent:ignoringPinnedState:]):
Added. Hand the event directly to ViewGestureController, optionally
ignoring whether or not the WKView is scrollable (always pretending that it is not).
* UIProcess/mac/ViewGestureController.h:
(WebKit::ViewGestureController::shouldIgnorePinnedState):
(WebKit::ViewGestureController::setShouldIgnorePinnedState):
* UIProcess/mac/ViewGestureControllerMac.mm:
(WebKit::ViewGestureController::ViewGestureController):
(WebKit::ViewGestureController::scrollEventCanBecomeSwipe):
(WebKit::ViewGestureController::handleScrollWheelEvent):
(WebKit::ViewGestureController::wheelEventWasNotHandledByWebCore):
(WebKit::scrollEventCanBecomeSwipe):
If we're ignoring the view's pinned state, pretend that we're always pinned,
and don't worry about sending events to WebCore.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKViewPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKViewmm">trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacViewGestureControllerh">trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacViewGestureControllerMacmm">trunk/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (167765 => 167766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2014-04-24 17:30:57 UTC (rev 167765)
+++ trunk/Source/WebKit2/ChangeLog        2014-04-24 17:48:28 UTC (rev 167766)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2014-04-24 Tim Horton <timothy_horton@apple.com>
+
+ [wk2] Provide SPI allowing clients to hand events directly to swipe code, bypassing scrolling
+ https://bugs.webkit.org/show_bug.cgi?id=132092
+ <rdar://problem/15948244>
+
+ Reviewed by Darin Adler.
+
+ * UIProcess/API/Cocoa/WKViewPrivate.h:
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView _tryToSwipeWithEvent:ignoringPinnedState:]):
+ Added. Hand the event directly to ViewGestureController, optionally
+ ignoring whether or not the WKView is scrollable (always pretending that it is not).
+
+ * UIProcess/mac/ViewGestureController.h:
+ (WebKit::ViewGestureController::shouldIgnorePinnedState):
+ (WebKit::ViewGestureController::setShouldIgnorePinnedState):
+ * UIProcess/mac/ViewGestureControllerMac.mm:
+ (WebKit::ViewGestureController::ViewGestureController):
+ (WebKit::ViewGestureController::scrollEventCanBecomeSwipe):
+ (WebKit::ViewGestureController::handleScrollWheelEvent):
+ (WebKit::ViewGestureController::wheelEventWasNotHandledByWebCore):
+ (WebKit::scrollEventCanBecomeSwipe):
+ If we're ignoring the view's pinned state, pretend that we're always pinned,
+ and don't worry about sending events to WebCore.
+
</ins><span class="cx"> 2014-04-24 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] wmode='transparent' for flash plugin doesn't work
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h (167765 => 167766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h        2014-04-24 17:30:57 UTC (rev 167765)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h        2014-04-24 17:48:28 UTC (rev 167766)
</span><span class="lines">@@ -106,6 +106,7 @@
</span><span class="cx">
</span><span class="cx"> // Views must be layer-backed, have no transform applied, be in back-to-front z-order, and the whole set must be a contiguous opaque rectangle.
</span><span class="cx"> - (void)_setCustomSwipeViews:(NSArray *)customSwipeViews;
</span><ins>+- (BOOL)_tryToSwipeWithEvent:(NSEvent *)event ignoringPinnedState:(BOOL)ignoringPinnedState;
</ins><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (167765 => 167766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm        2014-04-24 17:30:57 UTC (rev 167765)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm        2014-04-24 17:48:28 UTC (rev 167766)
</span><span class="lines">@@ -3893,6 +3893,23 @@
</span><span class="cx"> _data->_gestureController->setCustomSwipeViews(views);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)_tryToSwipeWithEvent:(NSEvent *)event ignoringPinnedState:(BOOL)ignoringPinnedState
+{
+ if (!_data->_allowsBackForwardNavigationGestures)
+ return NO;
+
+ [self _ensureGestureController];
+
+ BOOL wasIgnoringPinnedState = _data->_gestureController->shouldIgnorePinnedState();
+ _data->_gestureController->setShouldIgnorePinnedState(ignoringPinnedState);
+
+ BOOL handledEvent = _data->_gestureController->handleScrollWheelEvent(event);
+
+ _data->_gestureController->setShouldIgnorePinnedState(wasIgnoringPinnedState);
+
+ return handledEvent;
+}
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @implementation WKResponderChainSink
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacViewGestureControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.h (167765 => 167766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.h        2014-04-24 17:30:57 UTC (rev 167765)
+++ trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.h        2014-04-24 17:48:28 UTC (rev 167766)
</span><span class="lines">@@ -97,6 +97,9 @@
</span><span class="cx"> WebCore::FloatRect windowRelativeBoundsForCustomSwipeViews() const;
</span><span class="cx">
</span><span class="cx"> void endActiveGesture();
</span><ins>+
+ bool shouldIgnorePinnedState() { return m_shouldIgnorePinnedState; }
+ void setShouldIgnorePinnedState(bool ignore) { m_shouldIgnorePinnedState = ignore; }
</ins><span class="cx"> #else
</span><span class="cx"> void installSwipeHandler(UIView *gestureRecognizerView, UIView *swipingView);
</span><span class="cx"> bool canSwipeInDirection(SwipeDirection);
</span><span class="lines">@@ -126,6 +129,7 @@
</span><span class="cx"> void handleSwipeGesture(WebBackForwardListItem* targetItem, double progress, SwipeDirection);
</span><span class="cx"> void endSwipeGesture(WebBackForwardListItem* targetItem, bool cancelled);
</span><span class="cx"> bool deltaIsSufficientToBeginSwipe(NSEvent *);
</span><ins>+ bool scrollEventCanBecomeSwipe(NSEvent *, SwipeDirection&);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> WebPageProxy& m_webPageProxy;
</span><span class="lines">@@ -162,6 +166,8 @@
</span><span class="cx"> PendingSwipeReason m_pendingSwipeReason;
</span><span class="cx"> SwipeDirection m_pendingSwipeDirection;
</span><span class="cx"> WebCore::FloatSize m_cumulativeDeltaForPendingSwipe;
</span><ins>+
+ bool m_shouldIgnorePinnedState;
</ins><span class="cx"> #else
</span><span class="cx"> UIView *m_liveSwipeView;
</span><span class="cx"> RetainPtr<UIView> m_snapshotView;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacViewGestureControllerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm (167765 => 167766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm        2014-04-24 17:30:57 UTC (rev 167765)
+++ trunk/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm        2014-04-24 17:48:28 UTC (rev 167766)
</span><span class="lines">@@ -103,6 +103,7 @@
</span><span class="cx"> , m_frameHandlesMagnificationGesture(false)
</span><span class="cx"> , m_swipeTransitionStyle(SwipeTransitionStyle::Overlap)
</span><span class="cx"> , m_pendingSwipeReason(PendingSwipeReason::None)
</span><ins>+ , m_shouldIgnorePinnedState(false)
</ins><span class="cx"> {
</span><span class="cx"> m_webPageProxy.process().addMessageReceiver(Messages::ViewGestureController::messageReceiverName(), m_webPageProxy.pageID(), *this);
</span><span class="cx"> }
</span><span class="lines">@@ -257,7 +258,7 @@
</span><span class="cx"> m_lastMagnificationGestureWasSmartMagnification = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool scrollEventCanBecomeSwipe(NSEvent *event, WebPageProxy& webPageProxy, ViewGestureController::SwipeDirection& potentialSwipeDirection)
</del><ins>+bool ViewGestureController::scrollEventCanBecomeSwipe(NSEvent *event, ViewGestureController::SwipeDirection& potentialSwipeDirection)
</ins><span class="cx"> {
</span><span class="cx"> if (event.phase != NSEventPhaseBegan)
</span><span class="cx"> return false;
</span><span class="lines">@@ -271,8 +272,11 @@
</span><span class="cx"> if (fabs(event.scrollingDeltaX) <= fabs(event.scrollingDeltaY))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- bool willSwipeLeft = event.scrollingDeltaX > 0 && webPageProxy.isPinnedToLeftSide() && webPageProxy.backForwardList().backItem();
- bool willSwipeRight = event.scrollingDeltaX < 0 && webPageProxy.isPinnedToRightSide() && webPageProxy.backForwardList().forwardItem();
</del><ins>+ bool isPinnedToLeft = m_shouldIgnorePinnedState || m_webPageProxy.isPinnedToLeftSide();
+ bool isPinnedToRight = m_shouldIgnorePinnedState || m_webPageProxy.isPinnedToRightSide();
+
+ bool willSwipeLeft = event.scrollingDeltaX > 0 && isPinnedToLeft && m_webPageProxy.backForwardList().backItem();
+ bool willSwipeRight = event.scrollingDeltaX < 0 && isPinnedToRight && m_webPageProxy.backForwardList().forwardItem();
</ins><span class="cx"> if (!willSwipeLeft && !willSwipeRight)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -320,10 +324,10 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> SwipeDirection direction;
</span><del>- if (!scrollEventCanBecomeSwipe(event, m_webPageProxy, direction))
</del><ins>+ if (!scrollEventCanBecomeSwipe(event, direction))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (m_webPageProxy.willHandleHorizontalScrollEvents()) {
</del><ins>+ if (!m_shouldIgnorePinnedState && m_webPageProxy.willHandleHorizontalScrollEvents()) {
</ins><span class="cx"> m_pendingSwipeReason = PendingSwipeReason::WebCoreMayScroll;
</span><span class="cx"> m_pendingSwipeDirection = direction;
</span><span class="cx"> return false;
</span><span class="lines">@@ -348,7 +352,7 @@
</span><span class="cx"> m_pendingSwipeReason = PendingSwipeReason::None;
</span><span class="cx">
</span><span class="cx"> SwipeDirection direction;
</span><del>- if (!scrollEventCanBecomeSwipe(event, m_webPageProxy, direction))
</del><ins>+ if (!scrollEventCanBecomeSwipe(event, direction))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (!deltaIsSufficientToBeginSwipe(event)) {
</span></span></pre>
</div>
</div>
</body>
</html>