<!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>[163323] 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/163323">163323</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-02-03 13:46:46 -0800 (Mon, 03 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>WebKit2 View Gestures: Two smart magnifications in a row without moving the mouse should zoom out
https://bugs.webkit.org/show_bug.cgi?id=128108
<rdar://problem/15914539>
Reviewed by Darin Adler.
* UIProcess/mac/ViewGestureController.h:
* UIProcess/mac/ViewGestureController.mm:
(WebKit::ViewGestureController::ViewGestureController):
(WebKit::ViewGestureController::handleMagnificationGesture):
Clear the bit that tells us that we should do "smart" things (because the
last gesture was also a smart magnification gesture) when the user manually pinch-magnifies.
(WebKit::ViewGestureController::didCollectGeometryForSmartMagnificationGesture):
Zoom out if the mouse hasn't moved since the last pinch-magnification gesture.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacViewGestureControllerh">trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacViewGestureControllermm">trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (163322 => 163323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-03 20:59:40 UTC (rev 163322)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-03 21:46:46 UTC (rev 163323)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-02-03 Tim Horton <timothy_horton@apple.com>
+
+ WebKit2 View Gestures: Two smart magnifications in a row without moving the mouse should zoom out
+ https://bugs.webkit.org/show_bug.cgi?id=128108
+ <rdar://problem/15914539>
+
+ Reviewed by Darin Adler.
+
+ * UIProcess/mac/ViewGestureController.h:
+ * UIProcess/mac/ViewGestureController.mm:
+ (WebKit::ViewGestureController::ViewGestureController):
+ (WebKit::ViewGestureController::handleMagnificationGesture):
+ Clear the bit that tells us that we should do "smart" things (because the
+ last gesture was also a smart magnification gesture) when the user manually pinch-magnifies.
+
+ (WebKit::ViewGestureController::didCollectGeometryForSmartMagnificationGesture):
+ Zoom out if the mouse hasn't moved since the last pinch-magnification gesture.
+
+
</ins><span class="cx"> 2014-02-03 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Try to fix 32-bit Mac build.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacViewGestureControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.h (163322 => 163323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.h 2014-02-03 20:59:40 UTC (rev 163322)
+++ trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.h 2014-02-03 21:46:46 UTC (rev 163323)
</span><span class="lines">@@ -100,7 +100,8 @@
</span><span class="cx"> WebCore::FloatPoint m_magnificationOrigin;
</span><span class="cx">
</span><span class="cx"> WebCore::FloatRect m_lastSmartMagnificationUnscaledTargetRect;
</span><del>- bool m_lastSmartMagnificationUnscaledTargetRectIsValid;
</del><ins>+ bool m_lastMagnificationGestureWasSmartMagnification;
+ WebCore::FloatPoint m_lastSmartMagnificationOrigin;
</ins><span class="cx">
</span><span class="cx"> ViewGestureType m_activeGestureType;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacViewGestureControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.mm (163322 => 163323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.mm 2014-02-03 20:59:40 UTC (rev 163322)
+++ trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.mm 2014-02-03 21:46:46 UTC (rev 163323)
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx">
</span><span class="cx"> ViewGestureController::ViewGestureController(WebPageProxy& webPageProxy)
</span><span class="cx"> : m_webPageProxy(webPageProxy)
</span><del>- , m_lastSmartMagnificationUnscaledTargetRectIsValid(false)
</del><ins>+ , m_lastMagnificationGestureWasSmartMagnification(false)
</ins><span class="cx"> , m_activeGestureType(ViewGestureType::None)
</span><span class="cx"> , m_visibleContentRectIsValid(false)
</span><span class="cx"> , m_frameHandlesMagnificationGesture(false)
</span><span class="lines">@@ -153,6 +153,7 @@
</span><span class="cx"> // FIXME: We drop the first frame of the gesture on the floor, because we don't have the visible content bounds yet.
</span><span class="cx"> m_magnification = m_webPageProxy.pageScaleFactor();
</span><span class="cx"> m_webPageProxy.process().send(Messages::ViewGestureGeometryCollector::CollectGeometryForMagnificationGesture(), m_webPageProxy.pageID());
</span><ins>+ m_lastMagnificationGestureWasSmartMagnification = false;
</ins><span class="cx">
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -225,12 +226,15 @@
</span><span class="cx"> targetMagnification = std::min(std::max(targetMagnification, minMagnification), maxMagnification);
</span><span class="cx">
</span><span class="cx"> // Allow panning between elements via double-tap while magnified, unless the target rect is
</span><del>- // similar to the last one, in which case we'll zoom all the way out.
- if (currentScaleFactor > 1
- && m_lastSmartMagnificationUnscaledTargetRectIsValid
- && maximumRectangleComponentDelta(m_lastSmartMagnificationUnscaledTargetRect, unscaledTargetRect) < smartMagnificationPanScrollThreshold)
- targetMagnification = 1;
</del><ins>+ // similar to the last one or the mouse has not moved, in which case we'll zoom all the way out.
+ if (currentScaleFactor > 1 && m_lastMagnificationGestureWasSmartMagnification) {
+ if (maximumRectangleComponentDelta(m_lastSmartMagnificationUnscaledTargetRect, unscaledTargetRect) < smartMagnificationPanScrollThreshold)
+ targetMagnification = 1;
</ins><span class="cx">
</span><ins>+ if (m_lastSmartMagnificationOrigin == origin)
+ targetMagnification = 1;
+ }
+
</ins><span class="cx"> FloatRect targetRect(unscaledTargetRect);
</span><span class="cx"> targetRect.scale(targetMagnification);
</span><span class="cx"> FloatPoint targetOrigin(visibleContentRect.center());
</span><span class="lines">@@ -240,7 +244,9 @@
</span><span class="cx"> m_webPageProxy.drawingArea()->commitTransientZoom(targetMagnification, targetOrigin);
</span><span class="cx">
</span><span class="cx"> m_lastSmartMagnificationUnscaledTargetRect = unscaledTargetRect;
</span><del>- m_lastSmartMagnificationUnscaledTargetRectIsValid = true;
</del><ins>+ m_lastSmartMagnificationOrigin = origin;
+
+ m_lastMagnificationGestureWasSmartMagnification = true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ViewGestureController::handleScrollWheelEvent(NSEvent *event)
</span></span></pre>
</div>
</div>
</body>
</html>