<!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>[186170] tags/Safari-601.1.38/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/186170">186170</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-06-30 23:18:38 -0700 (Tue, 30 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Roll out <a href="http://trac.webkit.org/projects/webkit/changeset/186148">r186148</a>. rdar://problem/20655729</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari601138SourceWebKit2ChangeLog">tags/Safari-601.1.38/Source/WebKit2/ChangeLog</a></li>
<li><a href="#tagsSafari601138SourceWebKit2PlatformspiiosUIKitSPIh">tags/Safari-601.1.38/Source/WebKit2/Platform/spi/ios/UIKitSPI.h</a></li>
<li><a href="#tagsSafari601138SourceWebKit2SharedWebEventh">tags/Safari-601.1.38/Source/WebKit2/Shared/WebEvent.h</a></li>
<li><a href="#tagsSafari601138SourceWebKit2SharedWebEventConversioncpp">tags/Safari-601.1.38/Source/WebKit2/Shared/WebEventConversion.cpp</a></li>
<li><a href="#tagsSafari601138SourceWebKit2SharediosNativeWebTouchEventIOSmm">tags/Safari-601.1.38/Source/WebKit2/Shared/ios/NativeWebTouchEventIOS.mm</a></li>
<li><a href="#tagsSafari601138SourceWebKit2SharediosWebTouchEventIOScpp">tags/Safari-601.1.38/Source/WebKit2/Shared/ios/WebTouchEventIOS.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari601138SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.38/Source/WebKit2/ChangeLog (186169 => 186170)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.38/Source/WebKit2/ChangeLog 2015-07-01 06:17:20 UTC (rev 186169)
+++ tags/Safari-601.1.38/Source/WebKit2/ChangeLog 2015-07-01 06:18:38 UTC (rev 186170)
</span><span class="lines">@@ -1,3 +1,7 @@
</span><ins>+2015-06-30 Babak Shafiei <bshafiei@apple.com>
+
+ Roll out r186148.
+
</ins><span class="cx"> 2015-06-30 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix CoordinatedGraphics.
</span></span></pre></div>
<a id="tagsSafari601138SourceWebKit2PlatformspiiosUIKitSPIh"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.38/Source/WebKit2/Platform/spi/ios/UIKitSPI.h (186169 => 186170)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.38/Source/WebKit2/Platform/spi/ios/UIKitSPI.h 2015-07-01 06:17:20 UTC (rev 186169)
+++ tags/Safari-601.1.38/Source/WebKit2/Platform/spi/ios/UIKitSPI.h 2015-07-01 06:18:38 UTC (rev 186170)
</span><span class="lines">@@ -586,10 +586,6 @@
</span><span class="cx">
</span><span class="cx"> struct _UIWebTouchPoint* touchPoints;
</span><span class="cx"> unsigned touchPointCount;
</span><del>-
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
- bool isPotentialTap;
-#endif
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> @protocol UIWebTouchEventsGestureRecognizerDelegate
</span></span></pre></div>
<a id="tagsSafari601138SourceWebKit2SharedWebEventh"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.38/Source/WebKit2/Shared/WebEvent.h (186169 => 186170)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.38/Source/WebKit2/Shared/WebEvent.h 2015-07-01 06:17:20 UTC (rev 186169)
+++ tags/Safari-601.1.38/Source/WebKit2/Shared/WebEvent.h 2015-07-01 06:18:38 UTC (rev 186170)
</span><span class="lines">@@ -325,12 +325,11 @@
</span><span class="cx"> class WebTouchEvent : public WebEvent {
</span><span class="cx"> public:
</span><span class="cx"> WebTouchEvent() { }
</span><del>- WebTouchEvent(WebEvent::Type type, Modifiers modifiers, double timestamp, const Vector<WebPlatformTouchPoint>& touchPoints, WebCore::IntPoint position, bool isPotentialTap, bool isGesture, float gestureScale, float gestureRotation)
</del><ins>+ WebTouchEvent(WebEvent::Type type, Modifiers modifiers, double timestamp, const Vector<WebPlatformTouchPoint>& touchPoints, WebCore::IntPoint position, bool isGesture, float gestureScale, float gestureRotation)
</ins><span class="cx"> : WebEvent(type, modifiers, timestamp)
</span><span class="cx"> , m_touchPoints(touchPoints)
</span><span class="cx"> , m_position(position)
</span><span class="cx"> , m_canPreventNativeGestures(true)
</span><del>- , m_isPotentialTap(isPotentialTap)
</del><span class="cx"> , m_isGesture(isGesture)
</span><span class="cx"> , m_gestureScale(gestureScale)
</span><span class="cx"> , m_gestureRotation(gestureRotation)
</span><span class="lines">@@ -342,8 +341,6 @@
</span><span class="cx">
</span><span class="cx"> WebCore::IntPoint position() const { return m_position; }
</span><span class="cx">
</span><del>- bool isPotentialTap() const { return m_isPotentialTap; }
-
</del><span class="cx"> bool isGesture() const { return m_isGesture; }
</span><span class="cx"> float gestureScale() const { return m_gestureScale; }
</span><span class="cx"> float gestureRotation() const { return m_gestureRotation; }
</span><span class="lines">@@ -361,7 +358,6 @@
</span><span class="cx">
</span><span class="cx"> WebCore::IntPoint m_position;
</span><span class="cx"> bool m_canPreventNativeGestures;
</span><del>- bool m_isPotentialTap;
</del><span class="cx"> bool m_isGesture;
</span><span class="cx"> float m_gestureScale;
</span><span class="cx"> float m_gestureRotation;
</span></span></pre></div>
<a id="tagsSafari601138SourceWebKit2SharedWebEventConversioncpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.38/Source/WebKit2/Shared/WebEventConversion.cpp (186169 => 186170)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.38/Source/WebKit2/Shared/WebEventConversion.cpp 2015-07-01 06:17:20 UTC (rev 186169)
+++ tags/Safari-601.1.38/Source/WebKit2/Shared/WebEventConversion.cpp 2015-07-01 06:18:38 UTC (rev 186170)
</span><span class="lines">@@ -332,7 +332,6 @@
</span><span class="cx"> m_gestureRotation = webEvent.gestureRotation();
</span><span class="cx"> m_canPreventNativeGestures = webEvent.canPreventNativeGestures();
</span><span class="cx"> m_isGesture = webEvent.isGesture();
</span><del>- m_isPotentialTap = webEvent.isPotentialTap();
</del><span class="cx"> m_position = webEvent.position();
</span><span class="cx"> m_globalPosition = webEvent.position();
</span><span class="cx"> #else
</span></span></pre></div>
<a id="tagsSafari601138SourceWebKit2SharediosNativeWebTouchEventIOSmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.38/Source/WebKit2/Shared/ios/NativeWebTouchEventIOS.mm (186169 => 186170)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.38/Source/WebKit2/Shared/ios/NativeWebTouchEventIOS.mm 2015-07-01 06:17:20 UTC (rev 186169)
+++ tags/Safari-601.1.38/Source/WebKit2/Shared/ios/NativeWebTouchEventIOS.mm 2015-07-01 06:18:38 UTC (rev 186170)
</span><span class="lines">@@ -96,20 +96,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> NativeWebTouchEvent::NativeWebTouchEvent(const _UIWebTouchEvent* event)
</span><del>- : WebTouchEvent(
- webEventTypeForUIWebTouchEventType(event->type),
- static_cast<Modifiers>(0),
- event->timestamp,
- extractWebTouchPoint(event),
- positionForCGPoint(event->locationInDocumentCoordinates),
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
- event->isPotentialTap,
-#else
- true,
-#endif
- event->inJavaScriptGesture,
- event->scale,
- event->rotation)
</del><ins>+ : 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="tagsSafari601138SourceWebKit2SharediosWebTouchEventIOScpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.38/Source/WebKit2/Shared/ios/WebTouchEventIOS.cpp (186169 => 186170)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.38/Source/WebKit2/Shared/ios/WebTouchEventIOS.cpp 2015-07-01 06:17:20 UTC (rev 186169)
+++ tags/Safari-601.1.38/Source/WebKit2/Shared/ios/WebTouchEventIOS.cpp 2015-07-01 06:18:38 UTC (rev 186170)
</span><span class="lines">@@ -41,7 +41,6 @@
</span><span class="cx"> encoder << m_touchPoints;
</span><span class="cx"> encoder << m_position;
</span><span class="cx"> encoder << m_canPreventNativeGestures;
</span><del>- encoder << m_isPotentialTap;
</del><span class="cx"> encoder << m_isGesture;
</span><span class="cx"> encoder << m_gestureScale;
</span><span class="cx"> encoder << m_gestureRotation;
</span><span class="lines">@@ -58,8 +57,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(result.m_canPreventNativeGestures))
</span><span class="cx"> return false;
</span><del>- if (!decoder.decode(result.m_isPotentialTap))
- return false;
</del><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>
</div>
</body>
</html>