<!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>[163645] 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/163645">163645</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-07 14:01:38 -0800 (Fri, 07 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2] Fitler touch events only based on touch start
https://bugs.webkit.org/show_bug.cgi?id=128354
Patch by Benjamin Poulain <bpoulain@apple.com> on 2014-02-07
Reviewed by Simon Fraser.
Touch Events track their target, we should not test the touch regions
again after a touch sequence starts.
This patch adds a boolean flag to know if we are sending events to the WebProcess
(m_isTrackingTouchEvents). The flag is updated every time a touch sequence starts.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::WebPageProxy):
(WebKit::WebPageProxy::shouldStartTrackingTouchEvents):
(WebKit::WebPageProxy::handleTouchEvent):
* UIProcess/WebPageProxy.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (163644 => 163645)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-07 21:42:30 UTC (rev 163644)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-07 22:01:38 UTC (rev 163645)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-02-07 Benjamin Poulain <bpoulain@apple.com>
+
+ [WK2] Fitler touch events only based on touch start
+ https://bugs.webkit.org/show_bug.cgi?id=128354
+
+ Reviewed by Simon Fraser.
+
+ Touch Events track their target, we should not test the touch regions
+ again after a touch sequence starts.
+
+ This patch adds a boolean flag to know if we are sending events to the WebProcess
+ (m_isTrackingTouchEvents). The flag is updated every time a touch sequence starts.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::WebPageProxy):
+ (WebKit::WebPageProxy::shouldStartTrackingTouchEvents):
+ (WebKit::WebPageProxy::handleTouchEvent):
+ * UIProcess/WebPageProxy.h:
+
</ins><span class="cx"> 2014-02-07 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Simplify WebPreferences creation inside WebPageGroup
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (163644 => 163645)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-02-07 21:42:30 UTC (rev 163644)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-02-07 22:01:38 UTC (rev 163645)
</span><span class="lines">@@ -297,6 +297,9 @@
</span><span class="cx"> , m_syncNavigationActionPolicyAction(PolicyUse)
</span><span class="cx"> , m_syncNavigationActionPolicyDownloadID(0)
</span><span class="cx"> , m_processingMouseMoveEvent(false)
</span><ins>+#if ENABLE(TOUCH_EVENTS)
+ , m_isTrackingTouchEvents(false)
+#endif
</ins><span class="cx"> , m_pageID(pageID)
</span><span class="cx"> , m_session(session)
</span><span class="cx"> , m_isPageSuspended(false)
</span><span class="lines">@@ -1382,34 +1385,35 @@
</span><span class="cx"> #endif // ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><ins>+
+bool WebPageProxy::shouldStartTrackingTouchEvents(const WebTouchEvent& touchStartEvent) const
+{
</ins><span class="cx"> #if ENABLE(ASYNC_SCROLLING)
</span><del>-static bool anyTouchIsInNonFastScrollableRegion(RemoteScrollingCoordinatorProxy& scrollingCoordinator, const WebTouchEvent& event)
-{
- for (auto touchPoint : event.touchPoints()) {
- if (scrollingCoordinator.isPointInNonFastScrollableRegion(touchPoint.location()))
</del><ins>+ for (auto touchPoint : touchStartEvent.touchPoints()) {
+ if (m_scrollingCoordinatorProxy->isPointInNonFastScrollableRegion(touchPoint.location()))
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return false;
</span><ins>+#endif // ENABLE(ASYNC_SCROLLING)
+ return true;
</ins><span class="cx"> }
</span><del>-#endif // ENABLE(ASYNC_SCROLLING)
</del><span class="cx">
</span><span class="cx"> void WebPageProxy::handleTouchEvent(const NativeWebTouchEvent& event)
</span><span class="cx"> {
</span><span class="cx"> if (!isValid())
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ if (event.type() == WebEvent::TouchStart)
+ m_isTrackingTouchEvents = shouldStartTrackingTouchEvents(event);
+
+ if (!m_isTrackingTouchEvents)
+ return;
+
</ins><span class="cx"> // If the page is suspended, which should be the case during panning, pinching
</span><span class="cx"> // and animation on the page itself (kinetic scrolling, tap to zoom) etc, then
</span><span class="cx"> // we do not send any of the events to the page even if is has listeners.
</span><span class="cx"> if (!m_isPageSuspended) {
</span><del>-
-#if ENABLE(ASYNC_SCROLLING)
- // FIXME: we should only do this check for the start of a touch gesture.
- if (!anyTouchIsInNonFastScrollableRegion(*m_scrollingCoordinatorProxy, event))
- return;
-#endif
-
</del><span class="cx"> m_touchEventQueue.append(event);
</span><span class="cx"> m_process->responsivenessTimer()->start();
</span><span class="cx"> if (m_shouldSendEventsSynchronously) {
</span><span class="lines">@@ -1429,6 +1433,9 @@
</span><span class="cx"> lastEvent.deferredTouchEvents.append(event);
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ if (event.type() == WebEvent::TouchEnd || event.type() == WebEvent::TouchCancel)
+ m_isTrackingTouchEvents = false;
</ins><span class="cx"> }
</span><span class="cx"> #endif // ENABLE(TOUCH_EVENTS)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (163644 => 163645)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-02-07 21:42:30 UTC (rev 163644)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-02-07 22:01:38 UTC (rev 163645)
</span><span class="lines">@@ -1009,10 +1009,6 @@
</span><span class="cx"> void didChangeContentSize(const WebCore::IntSize&);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(TOUCH_EVENTS)
- void needTouchEvents(bool);
-#endif
-
</del><span class="cx"> #if ENABLE(INPUT_TYPE_COLOR)
</span><span class="cx"> void showColorPicker(const WebCore::Color& initialColor, const WebCore::IntRect&);
</span><span class="cx"> void didChooseColor(const WebCore::Color&);
</span><span class="lines">@@ -1174,6 +1170,10 @@
</span><span class="cx"> void processNextQueuedWheelEvent();
</span><span class="cx"> void sendWheelEvent(const WebWheelEvent&);
</span><span class="cx">
</span><ins>+#if ENABLE(TOUCH_EVENTS)
+ bool shouldStartTrackingTouchEvents(const WebTouchEvent&) const;
+#endif
+
</ins><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> void findPlugin(const String& mimeType, uint32_t processType, const String& urlString, const String& frameURLString, const String& pageURLString, bool allowOnlyApplicationPlugins, uint64_t& pluginProcessToken, String& newMIMEType, uint32_t& pluginLoadPolicy, String& unavailabilityDescription);
</span><span class="cx"> #endif
</span><span class="lines">@@ -1331,6 +1331,7 @@
</span><span class="cx"> OwnPtr<NativeWebMouseEvent> m_currentlyProcessedMouseDownEvent;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><ins>+ bool m_isTrackingTouchEvents;
</ins><span class="cx"> Deque<QueuedTouchEvents> m_touchEventQueue;
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(INPUT_TYPE_COLOR)
</span></span></pre>
</div>
</div>
</body>
</html>