<!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>[192115] branches/safari-601.1.46-branch/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/192115">192115</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-11-06 11:58:31 -0800 (Fri, 06 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/189753">r189753</a>. rdar://problem/23420358</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchSourceWebKit2ChangeLog">branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2SharedWebEventh">branches/safari-601.1.46-branch/Source/WebKit2/Shared/WebEvent.h</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2SharediosNativeWebTouchEventIOSmm">branches/safari-601.1.46-branch/Source/WebKit2/Shared/ios/NativeWebTouchEventIOS.mm</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2SharediosWebPlatformTouchPointIOScpp">branches/safari-601.1.46-branch/Source/WebKit2/Shared/ios/WebPlatformTouchPointIOS.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog (192114 => 192115)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-11-06 19:57:10 UTC (rev 192114)
+++ branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-11-06 19:58:31 UTC (rev 192115)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-11-06 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r189753.
+
+ 2015-09-14 Dan Bernstein <mitz@apple.com>
+
+ Consolidate touch event code dealing with force.
+
+ Reviewed by Beth Dakin.
+
+ * Shared/WebEvent.h:
+ (WebKit::WebPlatformTouchPoint::state):
+ (WebKit::WebPlatformTouchPoint::setForce):
+ (WebKit::WebPlatformTouchPoint::force):
+ * Shared/ios/NativeWebTouchEventIOS.mm:
+ (WebKit::positionForCGPoint):
+ (WebKit::NativeWebTouchEvent::extractWebTouchPoint):
+ (WebKit::NativeWebTouchEvent::NativeWebTouchEvent):
+ * Shared/ios/WebPlatformTouchPointIOS.cpp:
+ (WebKit::WebPlatformTouchPoint::encode):
+ (WebKit::WebPlatformTouchPoint::decode):
+
</ins><span class="cx"> 2015-10-23 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r191487. rdar://problem/22811325
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2SharedWebEventh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/Shared/WebEvent.h (192114 => 192115)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/Shared/WebEvent.h 2015-11-06 19:57:10 UTC (rev 192114)
+++ branches/safari-601.1.46-branch/Source/WebKit2/Shared/WebEvent.h 2015-11-06 19:58:31 UTC (rev 192115)
</span><span class="lines">@@ -310,7 +310,8 @@
</span><span class="cx"> TouchPointState state() const { return phase(); }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(IOS_TOUCH_EVENTS)
</span><del>-#include <WebKitAdditions/WebEventIOS.h>
</del><ins>+ void setForce(double force) { m_force = force; }
+ double force() const { return m_force; }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void encode(IPC::ArgumentEncoder&) const;
</span><span class="lines">@@ -320,6 +321,9 @@
</span><span class="cx"> unsigned m_identifier;
</span><span class="cx"> WebCore::IntPoint m_location;
</span><span class="cx"> uint32_t m_phase;
</span><ins>+#if ENABLE(IOS_TOUCH_EVENTS)
+ double m_force { 0 };
+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class WebTouchEvent : public WebEvent {
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2SharediosNativeWebTouchEventIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/Shared/ios/NativeWebTouchEventIOS.mm (192114 => 192115)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/Shared/ios/NativeWebTouchEventIOS.mm 2015-11-06 19:57:10 UTC (rev 192114)
+++ branches/safari-601.1.46-branch/Source/WebKit2/Shared/ios/NativeWebTouchEventIOS.mm 2015-11-06 19:58:31 UTC (rev 192115)
</span><span class="lines">@@ -75,9 +75,6 @@
</span><span class="cx"> return WebCore::IntPoint(position);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(IOS_TOUCH_EVENTS)
-#import <WebKitAdditions/NativeWebTouchEventIOS.mm>
-#else
</del><span class="cx"> Vector<WebPlatformTouchPoint> NativeWebTouchEvent::extractWebTouchPoint(const _UIWebTouchEvent* event)
</span><span class="cx"> {
</span><span class="cx"> unsigned touchCount = event->touchPointCount;
</span><span class="lines">@@ -89,11 +86,14 @@
</span><span class="cx"> unsigned identifier = touchPoint.identifier;
</span><span class="cx"> WebCore::IntPoint location = positionForCGPoint(touchPoint.locationInDocumentCoordinates);
</span><span class="cx"> WebPlatformTouchPoint::TouchPointState phase = convertTouchPhase(touchPoint.phase);
</span><del>- touchPointList.uncheckedAppend(WebPlatformTouchPoint(identifier, location, phase));
</del><ins>+ WebPlatformTouchPoint platformTouchPoint = WebPlatformTouchPoint(identifier, location, phase);
+#if ENABLE(IOS_TOUCH_EVENTS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
+ platformTouchPoint.setForce(touchPoint.force);
+#endif
+ touchPointList.uncheckedAppend(platformTouchPoint);
</ins><span class="cx"> }
</span><span class="cx"> return touchPointList;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> NativeWebTouchEvent::NativeWebTouchEvent(const _UIWebTouchEvent* event)
</span><span class="cx"> : WebTouchEvent(
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2SharediosWebPlatformTouchPointIOScpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/Shared/ios/WebPlatformTouchPointIOS.cpp (192114 => 192115)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/Shared/ios/WebPlatformTouchPointIOS.cpp 2015-11-06 19:57:10 UTC (rev 192114)
+++ branches/safari-601.1.46-branch/Source/WebKit2/Shared/ios/WebPlatformTouchPointIOS.cpp 2015-11-06 19:58:31 UTC (rev 192115)
</span><span class="lines">@@ -35,14 +35,14 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-#if ENABLE(IOS_TOUCH_EVENTS)
-#import <WebKitAdditions/WebPlatformTouchPointIOS.cpp>
-#else
</del><span class="cx"> void WebPlatformTouchPoint::encode(IPC::ArgumentEncoder& encoder) const
</span><span class="cx"> {
</span><span class="cx"> encoder << m_identifier;
</span><span class="cx"> encoder << m_location;
</span><span class="cx"> encoder << m_phase;
</span><ins>+#if ENABLE(IOS_TOUCH_EVENTS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
+ encoder << m_force;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebPlatformTouchPoint::decode(IPC::ArgumentDecoder& decoder, WebPlatformTouchPoint& result)
</span><span class="lines">@@ -53,9 +53,12 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(result.m_phase))
</span><span class="cx"> return false;
</span><ins>+#if ENABLE(IOS_TOUCH_EVENTS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
+ if (!decoder.decode(result.m_force))
+ return false;
+#endif
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><del>-#endif // ENABLE(IOS_TOUCH_EVENTS)
</del><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>