<!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>[182216] 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/182216">182216</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2015-03-31 18:15:58 -0700 (Tue, 31 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>WKView should stop using endGestureWithEvent
https://bugs.webkit.org/show_bug.cgi?id=143285
<rdar://problem/20357007>
Reviewed by Simon Fraser.
* UIProcess/API/mac/WKView.mm:
(-[WKView magnifyWithEvent:]):
(-[WKView endGestureWithEvent:]): Deleted.
* UIProcess/mac/ViewGestureController.h:
* UIProcess/mac/ViewGestureControllerMac.mm:
(WebKit::ViewGestureController::endMagnificationGesture):
(WebKit::ViewGestureController::endActiveGesture): Deleted.
While there is no visible symptom, it is recommended that we check
the phase of normal magnification events instead of using the
special gesture end events.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKViewmm">trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacViewGestureControllerh">trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacViewGestureControllerMacmm">trunk/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (182215 => 182216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-03-31 23:42:31 UTC (rev 182215)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-01 01:15:58 UTC (rev 182216)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2015-03-31 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><ins>+ WKView should stop using endGestureWithEvent
+ https://bugs.webkit.org/show_bug.cgi?id=143285
+ <rdar://problem/20357007>
+
+ Reviewed by Simon Fraser.
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView magnifyWithEvent:]):
+ (-[WKView endGestureWithEvent:]): Deleted.
+ * UIProcess/mac/ViewGestureController.h:
+ * UIProcess/mac/ViewGestureControllerMac.mm:
+ (WebKit::ViewGestureController::endMagnificationGesture):
+ (WebKit::ViewGestureController::endActiveGesture): Deleted.
+ While there is no visible symptom, it is recommended that we check
+ the phase of normal magnification events instead of using the
+ special gesture end events.
+
+2015-03-31 Timothy Horton <timothy_horton@apple.com>
+
</ins><span class="cx"> Swipes occur in the wrong direction in RTL
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=143257
</span><span class="cx"> <rdar://problem/20300862>
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (182215 => 182216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-03-31 23:42:31 UTC (rev 182215)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-04-01 01:15:58 UTC (rev 182216)
</span><span class="lines">@@ -4419,6 +4419,9 @@
</span><span class="cx"> [self _ensureGestureController];
</span><span class="cx">
</span><span class="cx"> _data->_gestureController->handleMagnificationGesture(event.magnification, [self convertPoint:event.locationInWindow fromView:nil]);
</span><ins>+
+ if (event.phase == NSEventPhaseEnded || event.phase == NSEventPhaseCancelled)
+ _data->_gestureController->endMagnificationGesture();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)smartMagnifyWithEvent:(NSEvent *)event
</span><span class="lines">@@ -4435,16 +4438,6 @@
</span><span class="cx"> _data->_gestureController->handleSmartMagnificationGesture([self convertPoint:event.locationInWindow fromView:nil]);
</span><span class="cx"> }
</span><span class="cx">
</span><del>--(void)endGestureWithEvent:(NSEvent *)event
-{
- if (!_data->_gestureController) {
- [super endGestureWithEvent:event];
- return;
- }
-
- _data->_gestureController->endActiveGesture();
-}
-
</del><span class="cx"> - (void)setMagnification:(double)magnification centeredAtPoint:(NSPoint)point
</span><span class="cx"> {
</span><span class="cx"> [self _dismissContentRelativeChildWindows];
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacViewGestureControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.h (182215 => 182216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.h 2015-03-31 23:42:31 UTC (rev 182215)
+++ trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.h 2015-04-01 01:15:58 UTC (rev 182216)
</span><span class="lines">@@ -94,6 +94,8 @@
</span><span class="cx"> double magnification() const;
</span><span class="cx">
</span><span class="cx"> void handleMagnificationGesture(double scale, WebCore::FloatPoint origin);
</span><ins>+ void endMagnificationGesture();
+
</ins><span class="cx"> void handleSmartMagnificationGesture(WebCore::FloatPoint origin);
</span><span class="cx">
</span><span class="cx"> bool handleScrollWheelEvent(NSEvent *);
</span><span class="lines">@@ -104,8 +106,6 @@
</span><span class="cx"> WebCore::FloatRect windowRelativeBoundsForCustomSwipeViews() const;
</span><span class="cx"> void setDidMoveSwipeSnapshotCallback(void(^)(CGRect));
</span><span class="cx">
</span><del>- void endActiveGesture();
-
</del><span class="cx"> bool shouldIgnorePinnedState() { return m_shouldIgnorePinnedState; }
</span><span class="cx"> void setShouldIgnorePinnedState(bool ignore) { m_shouldIgnorePinnedState = ignore; }
</span><span class="cx">
</span><span class="lines">@@ -141,7 +141,6 @@
</span><span class="cx"> void didHitRenderTreeSizeThreshold();
</span><span class="cx"> void removeSwipeSnapshotAfterRepaint();
</span><span class="cx">
</span><del>- void endMagnificationGesture();
</del><span class="cx"> WebCore::FloatPoint scaledMagnificationOrigin(WebCore::FloatPoint origin, double scale);
</span><span class="cx">
</span><span class="cx"> void trackSwipeGesture(NSEvent *, SwipeDirection);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacViewGestureControllerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm (182215 => 182216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm 2015-03-31 23:42:31 UTC (rev 182215)
+++ trunk/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm 2015-04-01 01:15:58 UTC (rev 182216)
</span><span class="lines">@@ -179,7 +179,8 @@
</span><span class="cx">
</span><span class="cx"> void ViewGestureController::endMagnificationGesture()
</span><span class="cx"> {
</span><del>- ASSERT(m_activeGestureType == ViewGestureType::Magnification);
</del><ins>+ if (m_activeGestureType != ViewGestureType::Magnification)
+ return;
</ins><span class="cx">
</span><span class="cx"> double newMagnification = std::min(std::max(m_magnification, minMagnification), maxMagnification);
</span><span class="cx">
</span><span class="lines">@@ -191,6 +192,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_activeGestureType = ViewGestureType::None;
</span><ins>+ m_visibleContentRectIsValid = false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ViewGestureController::handleSmartMagnificationGesture(FloatPoint origin)
</span><span class="lines">@@ -787,14 +789,6 @@
</span><span class="cx"> m_backgroundColorForCurrentSnapshot = Color();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ViewGestureController::endActiveGesture()
-{
- if (m_activeGestureType == ViewGestureType::Magnification) {
- endMagnificationGesture();
- m_visibleContentRectIsValid = false;
- }
-}
-
</del><span class="cx"> double ViewGestureController::magnification() const
</span><span class="cx"> {
</span><span class="cx"> if (m_activeGestureType == ViewGestureType::Magnification)
</span></span></pre>
</div>
</div>
</body>
</html>