<!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>[247048] trunk/Source/WebKit</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/247048">247048</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2019-07-02 06:54:58 -0700 (Tue, 02 Jul 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>[GTK] Support cancelling touchscreen back/forward gesture
https://bugs.webkit.org/show_bug.cgi?id=199401

Patch by Alexander Mikhaylenko <exalm7659@gmail.com> on 2019-07-02
Reviewed by Michael Catanzaro.

It should be possible to cancel the gesture when performing it on
touchscreen, for example, by moving pen too far from the screen.
Handle this case properly.

Only DragGesture in GestureController needs to handle this,
SwipeGesture simply won't emit the relevant event in this case.

* UIProcess/API/gtk/WebKitWebViewBase.cpp:
* UIProcess/ViewGestureController.h:
* UIProcess/gtk/GestureController.cpp:
(WebKit::GestureController::DragGesture::cancelDrag):
(WebKit::GestureController::DragGesture::cancel):
(WebKit::GestureController::DragGesture::DragGesture):
* UIProcess/gtk/GestureController.h:
* UIProcess/gtk/ViewGestureControllerGtk.cpp:
(WebKit::ViewGestureController::platformTeardown):
(WebKit::ViewGestureController::cancelSwipe):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPIgtkWebKitWebViewBasecpp">trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp</a></li>
<li><a href="#trunkSourceWebKitUIProcessViewGestureControllerh">trunk/Source/WebKit/UIProcess/ViewGestureController.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessgtkGestureControllercpp">trunk/Source/WebKit/UIProcess/gtk/GestureController.cpp</a></li>
<li><a href="#trunkSourceWebKitUIProcessgtkGestureControllerh">trunk/Source/WebKit/UIProcess/gtk/GestureController.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessgtkViewGestureControllerGtkcpp">trunk/Source/WebKit/UIProcess/gtk/ViewGestureControllerGtk.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (247047 => 247048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2019-07-02 12:40:51 UTC (rev 247047)
+++ trunk/Source/WebKit/ChangeLog       2019-07-02 13:54:58 UTC (rev 247048)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2019-07-02  Alexander Mikhaylenko  <exalm7659@gmail.com>
+
+        [GTK] Support cancelling touchscreen back/forward gesture
+        https://bugs.webkit.org/show_bug.cgi?id=199401
+
+        Reviewed by Michael Catanzaro.
+
+        It should be possible to cancel the gesture when performing it on
+        touchscreen, for example, by moving pen too far from the screen.
+        Handle this case properly.
+
+        Only DragGesture in GestureController needs to handle this,
+        SwipeGesture simply won't emit the relevant event in this case.
+
+        * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+        * UIProcess/ViewGestureController.h:
+        * UIProcess/gtk/GestureController.cpp:
+        (WebKit::GestureController::DragGesture::cancelDrag):
+        (WebKit::GestureController::DragGesture::cancel):
+        (WebKit::GestureController::DragGesture::DragGesture):
+        * UIProcess/gtk/GestureController.h:
+        * UIProcess/gtk/ViewGestureControllerGtk.cpp:
+        (WebKit::ViewGestureController::platformTeardown):
+        (WebKit::ViewGestureController::cancelSwipe):
+
</ins><span class="cx"> 2019-07-02  Devin Rousso  <drousso@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Web Inspector: Debug: "Reset Web Inspector" should also clear the saved window size and attachment side
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPIgtkWebKitWebViewBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp (247047 => 247048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp      2019-07-02 12:40:51 UTC (rev 247047)
+++ trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp 2019-07-02 13:54:58 UTC (rev 247048)
</span><span class="lines">@@ -1177,6 +1177,12 @@
</span><span class="cx">         webkitWebViewBaseHandleWheelEvent(m_webView, scrollEvent.get(), WebWheelEvent::Phase::PhaseChanged);
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    void cancelDrag() final
+    {
+        if (auto* controller = webkitWebViewBaseViewGestureController(m_webView))
+            controller->cancelSwipe();
+    }
+
</ins><span class="cx">     void swipe(GdkEventTouch* event, const FloatPoint& velocity) final
</span><span class="cx">     {
</span><span class="cx">         double x, y;
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessViewGestureControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ViewGestureController.h (247047 => 247048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ViewGestureController.h    2019-07-02 12:40:51 UTC (rev 247047)
+++ trunk/Source/WebKit/UIProcess/ViewGestureController.h       2019-07-02 13:54:58 UTC (rev 247048)
</span><span class="lines">@@ -165,6 +165,7 @@
</span><span class="cx">     bool isSwipeGestureEnabled() { return m_swipeGestureEnabled; }
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(GTK)
</span><ins>+    void cancelSwipe();
</ins><span class="cx">     void draw(cairo_t*, cairo_pattern_t*);
</span><span class="cx"> #endif
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessgtkGestureControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/gtk/GestureController.cpp (247047 => 247048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/gtk/GestureController.cpp  2019-07-02 12:40:51 UTC (rev 247047)
+++ trunk/Source/WebKit/UIProcess/gtk/GestureController.cpp     2019-07-02 13:54:58 UTC (rev 247048)
</span><span class="lines">@@ -95,6 +95,12 @@
</span><span class="cx">         FloatPoint::narrowPrecision((m_offset.x() - x) / Scrollbar::pixelsPerLineStep(), (m_offset.y() - y) / Scrollbar::pixelsPerLineStep()));
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void GestureController::DragGesture::cancelDrag()
+{
+    ASSERT(m_inDrag);
+    m_client.cancelDrag();
+}
+
</ins><span class="cx"> void GestureController::DragGesture::handleTap(GdkEvent* event)
</span><span class="cx"> {
</span><span class="cx">     ASSERT(!m_inDrag);
</span><span class="lines">@@ -145,6 +151,12 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void GestureController::DragGesture::cancel(DragGesture* dragGesture, GdkEventSequence* sequence, GtkGesture* gesture)
+{
+    dragGesture->m_longPressTimeout.stop();
+    dragGesture->cancelDrag();
+}
+
</ins><span class="cx"> void GestureController::DragGesture::longPressFired()
</span><span class="cx"> {
</span><span class="cx">     m_inDrag = true;
</span><span class="lines">@@ -158,6 +170,7 @@
</span><span class="cx">     g_signal_connect_swapped(m_gesture.get(), "drag-begin", G_CALLBACK(begin), this);
</span><span class="cx">     g_signal_connect_swapped(m_gesture.get(), "drag-update", G_CALLBACK(update), this);
</span><span class="cx">     g_signal_connect_swapped(m_gesture.get(), "end", G_CALLBACK(end), this);
</span><ins>+    g_signal_connect_swapped(m_gesture.get(), "cancel", G_CALLBACK(cancel), this);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void GestureController::SwipeGesture::startMomentumScroll(GdkEvent* event, double velocityX, double velocityY)
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessgtkGestureControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/gtk/GestureController.h (247047 => 247048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/gtk/GestureController.h    2019-07-02 12:40:51 UTC (rev 247047)
+++ trunk/Source/WebKit/UIProcess/gtk/GestureController.h       2019-07-02 13:54:58 UTC (rev 247048)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx"> 
</span><span class="cx">     virtual void startDrag(GdkEventTouch*, const WebCore::FloatPoint&) = 0;
</span><span class="cx">     virtual void drag(GdkEventTouch*, const WebCore::FloatPoint&, const WebCore::FloatPoint&) = 0;
</span><ins>+    virtual void cancelDrag() = 0;
</ins><span class="cx"> 
</span><span class="cx">     virtual void swipe(GdkEventTouch*, const WebCore::FloatPoint&) = 0;
</span><span class="cx"> 
</span><span class="lines">@@ -94,6 +95,7 @@
</span><span class="cx">         // Notify that a drag started, allowing to stop kinetic deceleration.
</span><span class="cx">         void startDrag(GdkEvent*);
</span><span class="cx">         void handleDrag(GdkEvent*, double x, double y);
</span><ins>+        void cancelDrag();
</ins><span class="cx">         void handleTap(GdkEvent*);
</span><span class="cx">         void longPressFired();
</span><span class="cx"> 
</span><span class="lines">@@ -100,6 +102,7 @@
</span><span class="cx">         static void begin(DragGesture*, double x, double y, GtkGesture*);
</span><span class="cx">         static void update(DragGesture*, double x, double y, GtkGesture*);
</span><span class="cx">         static void end(DragGesture*, GdkEventSequence*, GtkGesture*);
</span><ins>+        static void cancel(DragGesture*, GdkEventSequence*, GtkGesture*);
</ins><span class="cx"> 
</span><span class="cx">         WebCore::FloatPoint m_start;
</span><span class="cx">         WebCore::FloatPoint m_offset;
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessgtkViewGestureControllerGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/gtk/ViewGestureControllerGtk.cpp (247047 => 247048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/gtk/ViewGestureControllerGtk.cpp   2019-07-02 12:40:51 UTC (rev 247047)
+++ trunk/Source/WebKit/UIProcess/gtk/ViewGestureControllerGtk.cpp      2019-07-02 13:54:58 UTC (rev 247048)
</span><span class="lines">@@ -59,10 +59,7 @@
</span><span class="cx"> 
</span><span class="cx"> void ViewGestureController::platformTeardown()
</span><span class="cx"> {
</span><del>-    m_swipeProgressTracker.reset();
-
-    if (m_activeGestureType == ViewGestureType::Swipe)
-        removeSwipeSnapshot();
</del><ins>+    cancelSwipe();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> bool ViewGestureController::PendingSwipeTracker::scrollEventCanStartSwipe(GdkEventScroll*)
</span><span class="lines">@@ -328,6 +325,16 @@
</span><span class="cx">     gtk_widget_queue_draw(m_webPageProxy.viewWidget());
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void ViewGestureController::cancelSwipe()
+{
+    m_pendingSwipeTracker.reset("cancelling swipe");
+
+    if (m_activeGestureType == ViewGestureType::Swipe) {
+        m_swipeProgressTracker.reset();
+        removeSwipeSnapshot();
+    }
+}
+
</ins><span class="cx"> void ViewGestureController::draw(cairo_t* cr, cairo_pattern_t* pageGroup)
</span><span class="cx"> {
</span><span class="cx">     bool swipingLeft = isPhysicallySwipingLeft(m_swipeProgressTracker.direction());
</span></span></pre>
</div>
</div>

</body>
</html>