<!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>[170408] 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/170408">170408</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-06-24 17:15:25 -0700 (Tue, 24 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS][WK2] Adopt the C API of UIWebTouchEventsGestureRecognizer for touch event mapping
https://bugs.webkit.org/show_bug.cgi?id=134234
Patch by Benjamin Poulain <bpoulain@apple.com> on 2014-06-24
Reviewed by Tim Horton.
The C API is more efficient and expose properties we will need for other patches. This patch moves from
getting each value independently on UIWebTouchEventsGestureRecognizer to the single structure exposed
by _UIWebTouchEvent.
* Shared/NativeWebTouchEvent.h:
* Shared/ios/NativeWebTouchEventIOS.mm:
(WebKit::convertTouchPhase):
(WebKit::extractWebTouchPoint):
(WebKit::NativeWebTouchEvent::NativeWebTouchEvent):
* 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="#trunkSourceWebKit2SharedNativeWebTouchEventh">trunk/Source/WebKit2/Shared/NativeWebTouchEvent.h</a></li>
<li><a href="#trunkSourceWebKit2SharediosNativeWebTouchEventIOSmm">trunk/Source/WebKit2/Shared/ios/NativeWebTouchEventIOS.mm</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 (170407 => 170408)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-25 00:13:04 UTC (rev 170407)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-25 00:15:25 UTC (rev 170408)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-06-24 Benjamin Poulain <bpoulain@apple.com>
+
+ [iOS][WK2] Adopt the C API of UIWebTouchEventsGestureRecognizer for touch event mapping
+ https://bugs.webkit.org/show_bug.cgi?id=134234
+
+ Reviewed by Tim Horton.
+
+ The C API is more efficient and expose properties we will need for other patches. This patch moves from
+ getting each value independently on UIWebTouchEventsGestureRecognizer to the single structure exposed
+ by _UIWebTouchEvent.
+
+ * Shared/NativeWebTouchEvent.h:
+ * Shared/ios/NativeWebTouchEventIOS.mm:
+ (WebKit::convertTouchPhase):
+ (WebKit::extractWebTouchPoint):
+ (WebKit::NativeWebTouchEvent::NativeWebTouchEvent):
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _webTouchEventsRecognized:]):
+
</ins><span class="cx"> 2014-06-24 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS]: WK2 Inspector Node Highlighting
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNativeWebTouchEventh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/NativeWebTouchEvent.h (170407 => 170408)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/NativeWebTouchEvent.h 2014-06-25 00:13:04 UTC (rev 170407)
+++ trunk/Source/WebKit2/Shared/NativeWebTouchEvent.h 2014-06-25 00:15:25 UTC (rev 170408)
</span><span class="lines">@@ -31,8 +31,7 @@
</span><span class="cx"> #include "WebEvent.h"
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>-#include <wtf/RetainPtr.h>
-OBJC_CLASS UIWebTouchEventsGestureRecognizer;
</del><ins>+struct _UIWebTouchEvent;
</ins><span class="cx"> #elif PLATFORM(GTK)
</span><span class="cx"> #include <WebCore/GUniquePtrGtk.h>
</span><span class="cx"> #include <WebCore/GtkTouchContextHelper.h>
</span><span class="lines">@@ -47,7 +46,7 @@
</span><span class="cx"> class NativeWebTouchEvent : public WebTouchEvent {
</span><span class="cx"> public:
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- explicit NativeWebTouchEvent(UIWebTouchEventsGestureRecognizer *);
</del><ins>+ explicit NativeWebTouchEvent(const _UIWebTouchEvent*);
</ins><span class="cx"> #elif PLATFORM(GTK)
</span><span class="cx"> NativeWebTouchEvent(const NativeWebTouchEvent&);
</span><span class="cx"> NativeWebTouchEvent(GdkEvent*, WebCore::GtkTouchContextHelper&);
</span></span></pre></div>
<a id="trunkSourceWebKit2SharediosNativeWebTouchEventIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ios/NativeWebTouchEventIOS.mm (170407 => 170408)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ios/NativeWebTouchEventIOS.mm 2014-06-25 00:13:04 UTC (rev 170407)
+++ trunk/Source/WebKit2/Shared/ios/NativeWebTouchEventIOS.mm 2014-06-25 00:15:25 UTC (rev 170408)
</span><span class="lines">@@ -51,9 +51,8 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static WebPlatformTouchPoint::TouchPointState convertTouchPhase(NSNumber *touchPhaseNumber)
</del><ins>+static WebPlatformTouchPoint::TouchPointState convertTouchPhase(UITouchPhase touchPhase)
</ins><span class="cx"> {
</span><del>- UITouchPhase touchPhase = static_cast<UITouchPhase>([touchPhaseNumber unsignedIntValue]);
</del><span class="cx"> switch (touchPhase) {
</span><span class="cx"> case UITouchPhaseBegan:
</span><span class="cx"> return WebPlatformTouchPoint::TouchPressed;
</span><span class="lines">@@ -76,27 +75,24 @@
</span><span class="cx"> return WebCore::IntPoint(position);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline Vector<WebPlatformTouchPoint> extractWebTouchPoint(UIWebTouchEventsGestureRecognizer *gestureRecognizer)
</del><ins>+static inline Vector<WebPlatformTouchPoint> extractWebTouchPoint(const _UIWebTouchEvent* event)
</ins><span class="cx"> {
</span><del>- unsigned touchCount = [gestureRecognizer.touchLocations count];
- NSArray *touchLocations = gestureRecognizer.touchLocations;
- NSArray *touchIdentifiers = gestureRecognizer.touchIdentifiers;
- NSArray *touchPhases = gestureRecognizer.touchPhases;
</del><ins>+ unsigned touchCount = event->touchPointCount;
</ins><span class="cx">
</span><span class="cx"> Vector<WebPlatformTouchPoint> touchPointList;
</span><span class="cx"> touchPointList.reserveInitialCapacity(touchCount);
</span><span class="cx"> for (unsigned i = 0; i < touchCount; ++i) {
</span><del>- unsigned identifier = [(NSNumber *)[touchIdentifiers objectAtIndex:i] unsignedIntValue];
- WebCore::IntPoint location = positionForCGPoint([(NSValue *)[touchLocations objectAtIndex:i] pointValue]);
- WebPlatformTouchPoint::TouchPointState phase = convertTouchPhase([touchPhases objectAtIndex:i]);
- WebPlatformTouchPoint touchPoint(identifier, location, phase);
- touchPointList.uncheckedAppend(touchPoint);
</del><ins>+ const _UIWebTouchPoint& touchPoint = event->touchPoints[i];
+ unsigned identifier = touchPoint.identifier;
+ WebCore::IntPoint location = positionForCGPoint(touchPoint.locationInDocumentCoordinates);
+ WebPlatformTouchPoint::TouchPointState phase = convertTouchPhase(touchPoint.phase);
+ touchPointList.uncheckedAppend(WebPlatformTouchPoint(identifier, location, phase));
</ins><span class="cx"> }
</span><span class="cx"> return touchPointList;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-NativeWebTouchEvent::NativeWebTouchEvent(UIWebTouchEventsGestureRecognizer *gestureRecognizer)
- : WebTouchEvent(webEventTypeForUIWebTouchEventType(gestureRecognizer.type), static_cast<Modifiers>(0), WTF::currentTime(), extractWebTouchPoint(gestureRecognizer), positionForCGPoint(gestureRecognizer.locationInWindow), gestureRecognizer.inJavaScriptGesture, gestureRecognizer.scale, gestureRecognizer.rotation)
</del><ins>+NativeWebTouchEvent::NativeWebTouchEvent(const _UIWebTouchEvent* event)
+ : WebTouchEvent(webEventTypeForUIWebTouchEventType(event->type), static_cast<Modifiers>(0), event->timestamp, extractWebTouchPoint(event), positionForCGPoint(event->locationInDocumentCoordinates), event->inJavaScriptGesture, event->scale, event->rotation)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (170407 => 170408)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-06-25 00:13:04 UTC (rev 170407)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-06-25 00:15:25 UTC (rev 170408)
</span><span class="lines">@@ -355,10 +355,11 @@
</span><span class="cx">
</span><span class="cx"> - (void)_webTouchEventsRecognized:(UIWebTouchEventsGestureRecognizer *)gestureRecognizer
</span><span class="cx"> {
</span><del>- NativeWebTouchEvent nativeWebTouchEvent(gestureRecognizer);
</del><ins>+ const _UIWebTouchEvent* lastTouchEvent = gestureRecognizer.lastTouchEvent;
+ NativeWebTouchEvent nativeWebTouchEvent(lastTouchEvent);
</ins><span class="cx">
</span><del>- _lastInteractionLocation = gestureRecognizer.locationInWindow;
- nativeWebTouchEvent.setCanPreventNativeGestures(!_canSendTouchEventsAsynchronously || [_touchEventGestureRecognizer isDefaultPrevented]);
</del><ins>+ _lastInteractionLocation = lastTouchEvent->locationInDocumentCoordinates;
+ nativeWebTouchEvent.setCanPreventNativeGestures(!_canSendTouchEventsAsynchronously || [gestureRecognizer isDefaultPrevented]);
</ins><span class="cx">
</span><span class="cx"> if (_canSendTouchEventsAsynchronously)
</span><span class="cx"> _page->handleTouchEventAsynchronously(nativeWebTouchEvent);
</span></span></pre>
</div>
</div>
</body>
</html>