<!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>[168393] 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/168393">168393</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-05-06 17:01:53 -0700 (Tue, 06 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS][WK2] WebKit2 does not set CanPreventNativeGestures on the platform events
https://bugs.webkit.org/show_bug.cgi?id=132594
Patch by Benjamin Poulain <bpoulain@apple.com> on 2014-05-06
Reviewed by Simon Fraser.
Set CanPreventNativeGestures on the plaform event.
Change the tracking of WKContentView to be similar to WebPageProxy.
* Shared/WebEvent.h:
(WebKit::WebTouchEvent::WebTouchEvent):
(WebKit::WebTouchEvent::canPreventNativeGestures):
(WebKit::WebTouchEvent::setCanPreventNativeGestures):
* Shared/WebEventConversion.cpp:
(WebKit::WebKit2PlatformTouchEvent::WebKit2PlatformTouchEvent):
* Shared/ios/WebTouchEventIOS.cpp:
(WebKit::WebTouchEvent::encode):
(WebKit::WebTouchEvent::decode):
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _webTouchEventsRecognized:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebEventcpp">trunk/Source/WebKit2/Shared/WebEvent.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebEventh">trunk/Source/WebKit2/Shared/WebEvent.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebEventConversioncpp">trunk/Source/WebKit2/Shared/WebEventConversion.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharediosWebTouchEventIOScpp">trunk/Source/WebKit2/Shared/ios/WebTouchEventIOS.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm">trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (168392 => 168393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-05-06 23:36:20 UTC (rev 168392)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-07 00:01:53 UTC (rev 168393)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2014-05-06 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><ins>+ [iOS][WK2] WebKit2 does not set CanPreventNativeGestures on the platform events
+ https://bugs.webkit.org/show_bug.cgi?id=132594
+
+ Reviewed by Simon Fraser.
+
+ Set CanPreventNativeGestures on the plaform event.
+ Change the tracking of WKContentView to be similar to WebPageProxy.
+
+ * Shared/WebEvent.h:
+ (WebKit::WebTouchEvent::WebTouchEvent):
+ (WebKit::WebTouchEvent::canPreventNativeGestures):
+ (WebKit::WebTouchEvent::setCanPreventNativeGestures):
+ * Shared/WebEventConversion.cpp:
+ (WebKit::WebKit2PlatformTouchEvent::WebKit2PlatformTouchEvent):
+ * Shared/ios/WebTouchEventIOS.cpp:
+ (WebKit::WebTouchEvent::encode):
+ (WebKit::WebTouchEvent::decode):
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _webTouchEventsRecognized:]):
+
+2014-05-06 Benjamin Poulain <bpoulain@apple.com>
+
</ins><span class="cx"> [iOS][WK2] Add tap highlight on the simple UITapGestureRecognizer
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=132623
</span><span class="cx"> <rdar://problem/16709507>
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebEventcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebEvent.cpp (168392 => 168393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebEvent.cpp 2014-05-06 23:36:20 UTC (rev 168392)
+++ trunk/Source/WebKit2/Shared/WebEvent.cpp 2014-05-07 00:01:53 UTC (rev 168393)
</span><span class="lines">@@ -63,5 +63,17 @@
</span><span class="cx"> return false;
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><del>-
</del><ins>+
+#if ENABLE(TOUCH_EVENTS)
+bool WebTouchEvent::allTouchPointsAreReleased() const
+{
+ for (const auto& touchPoint : touchPoints()) {
+ if (touchPoint.state() != WebPlatformTouchPoint::TouchReleased && touchPoint.state() != WebPlatformTouchPoint::TouchCancelled)
+ return false;
+ }
+
+ return true;
+}
+#endif
+
</ins><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebEventh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebEvent.h (168392 => 168393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebEvent.h 2014-05-06 23:36:20 UTC (rev 168392)
+++ trunk/Source/WebKit2/Shared/WebEvent.h 2014-05-07 00:01:53 UTC (rev 168393)
</span><span class="lines">@@ -298,6 +298,7 @@
</span><span class="cx"> : WebEvent(type, modifiers, timestamp)
</span><span class="cx"> , m_touchPoints(touchPoints)
</span><span class="cx"> , m_position(position)
</span><ins>+ , m_canPreventNativeGestures(true)
</ins><span class="cx"> , m_isGesture(isGesture)
</span><span class="cx"> , m_gestureScale(gestureScale)
</span><span class="cx"> , m_gestureRotation(gestureRotation)
</span><span class="lines">@@ -313,6 +314,11 @@
</span><span class="cx"> float gestureScale() const { return m_gestureScale; }
</span><span class="cx"> float gestureRotation() const { return m_gestureRotation; }
</span><span class="cx">
</span><ins>+ bool canPreventNativeGestures() const { return m_canPreventNativeGestures; }
+ void setCanPreventNativeGestures(bool canPreventNativeGestures) { m_canPreventNativeGestures = canPreventNativeGestures; }
+
+ bool allTouchPointsAreReleased() const;
+
</ins><span class="cx"> void encode(IPC::ArgumentEncoder&) const;
</span><span class="cx"> static bool decode(IPC::ArgumentDecoder&, WebTouchEvent&);
</span><span class="cx">
</span><span class="lines">@@ -320,6 +326,7 @@
</span><span class="cx"> Vector<WebPlatformTouchPoint> m_touchPoints;
</span><span class="cx">
</span><span class="cx"> WebCore::IntPoint m_position;
</span><ins>+ bool m_canPreventNativeGestures;
</ins><span class="cx"> bool m_isGesture;
</span><span class="cx"> float m_gestureScale;
</span><span class="cx"> float m_gestureRotation;
</span><span class="lines">@@ -355,6 +362,8 @@
</span><span class="cx">
</span><span class="cx"> void setState(TouchPointState state) { m_state = state; }
</span><span class="cx">
</span><ins>+ bool allTouchPointsAreReleased() const;
+
</ins><span class="cx"> void encode(IPC::ArgumentEncoder&) const;
</span><span class="cx"> static bool decode(IPC::ArgumentDecoder&, WebPlatformTouchPoint&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebEventConversioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebEventConversion.cpp (168392 => 168393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebEventConversion.cpp 2014-05-06 23:36:20 UTC (rev 168392)
+++ trunk/Source/WebKit2/Shared/WebEventConversion.cpp 2014-05-07 00:01:53 UTC (rev 168393)
</span><span class="lines">@@ -306,6 +306,7 @@
</span><span class="cx">
</span><span class="cx"> m_gestureScale = webEvent.gestureScale();
</span><span class="cx"> m_gestureRotation = webEvent.gestureRotation();
</span><ins>+ m_canPreventNativeGestures = webEvent.canPreventNativeGestures();
</ins><span class="cx"> m_isGesture = webEvent.isGesture();
</span><span class="cx"> m_position = webEvent.position();
</span><span class="cx"> m_globalPosition = webEvent.position();
</span></span></pre></div>
<a id="trunkSourceWebKit2SharediosWebTouchEventIOScpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ios/WebTouchEventIOS.cpp (168392 => 168393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ios/WebTouchEventIOS.cpp 2014-05-06 23:36:20 UTC (rev 168392)
+++ trunk/Source/WebKit2/Shared/ios/WebTouchEventIOS.cpp 2014-05-07 00:01:53 UTC (rev 168393)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2012 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2012-2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx">
</span><span class="cx"> encoder << m_touchPoints;
</span><span class="cx"> encoder << m_position;
</span><ins>+ encoder << m_canPreventNativeGestures;
</ins><span class="cx"> encoder << m_isGesture;
</span><span class="cx"> encoder << m_gestureScale;
</span><span class="cx"> encoder << m_gestureRotation;
</span><span class="lines">@@ -54,6 +55,8 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(result.m_position))
</span><span class="cx"> return false;
</span><ins>+ if (!decoder.decode(result.m_canPreventNativeGestures))
+ return false;
</ins><span class="cx"> if (!decoder.decode(result.m_isGesture))
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(result.m_gestureScale))
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (168392 => 168393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-05-06 23:36:20 UTC (rev 168392)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-05-07 00:01:53 UTC (rev 168393)
</span><span class="lines">@@ -1512,16 +1512,6 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool areAllTouchPointsReleased(const WebTouchEvent& event)
-{
- for (const auto& touchPoint : event.touchPoints()) {
- if (touchPoint.state() != WebPlatformTouchPoint::TouchReleased && touchPoint.state() != WebPlatformTouchPoint::TouchCancelled)
- return false;
- }
-
- return true;
-}
-
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(IOS_TOUCH_EVENTS)
</span><span class="lines">@@ -1543,7 +1533,7 @@
</span><span class="cx"> m_pageClient.doneWithTouchEvent(event, handled);
</span><span class="cx"> m_process->responsivenessTimer()->stop();
</span><span class="cx">
</span><del>- if (areAllTouchPointsReleased(event))
</del><ins>+ if (event.allTouchPointsAreReleased())
</ins><span class="cx"> m_isTrackingTouchEvents = false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1559,7 +1549,7 @@
</span><span class="cx">
</span><span class="cx"> m_process->send(Messages::EventDispatcher::TouchEvent(m_pageID, event), 0);
</span><span class="cx">
</span><del>- if (areAllTouchPointsReleased(event))
</del><ins>+ if (event.allTouchPointsAreReleased())
</ins><span class="cx"> m_isTrackingTouchEvents = false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1599,7 +1589,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (areAllTouchPointsReleased(event))
</del><ins>+ if (event.allTouchPointsAreReleased())
</ins><span class="cx"> m_isTrackingTouchEvents = false;
</span><span class="cx"> }
</span><span class="cx"> #endif // ENABLE(TOUCH_EVENTS)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (168392 => 168393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-05-06 23:36:20 UTC (rev 168392)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-05-07 00:01:53 UTC (rev 168393)
</span><span class="lines">@@ -298,15 +298,17 @@
</span><span class="cx"> - (void)_webTouchEventsRecognized:(UIWebTouchEventsGestureRecognizer *)gestureRecognizer
</span><span class="cx"> {
</span><span class="cx"> NativeWebTouchEvent nativeWebTouchEvent(gestureRecognizer);
</span><del>- if (nativeWebTouchEvent.type() == WebKit::WebEvent::TouchStart)
- _canSendTouchEventsAsynchronously = NO;
</del><span class="cx">
</span><span class="cx"> _lastInteractionLocation = gestureRecognizer.locationInWindow;
</span><ins>+ nativeWebTouchEvent.setCanPreventNativeGestures(!_canSendTouchEventsAsynchronously || [_touchEventGestureRecognizer isDefaultPrevented]);
</ins><span class="cx">
</span><span class="cx"> if (_canSendTouchEventsAsynchronously)
</span><span class="cx"> _page->handleTouchEventAsynchronously(nativeWebTouchEvent);
</span><span class="cx"> else
</span><span class="cx"> _page->handleTouchEventSynchronously(nativeWebTouchEvent);
</span><ins>+
+ if (nativeWebTouchEvent.allTouchPointsAreReleased())
+ _canSendTouchEventsAsynchronously = NO;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static FloatQuad inflateQuad(const FloatQuad& quad, float inflateSize)
</span></span></pre>
</div>
</div>
</body>
</html>