<!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>[160630] 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/160630">160630</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2013-12-15 22:39:18 -0800 (Sun, 15 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>WebKit2 View Gestures: Can't pinch in past the maximum scale
https://bugs.webkit.org/show_bug.cgi?id=125749
Reviewed by Anders Carlsson.
Pinching in past the maximum scale should result in the zoom resisting, but continuing.
* UIProcess/mac/ViewGestureController.cpp:
(WebKit::resistanceForDelta):
Clean up the logic and apply resistance to pinching in past the maximum.
(WebKit::ViewGestureController::handleMagnificationGesture):
(WebKit::ViewGestureController::endMagnificationGesture):
* WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
(WebKit::TiledCoreAnimationDrawingArea::commitTransientZoom):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacViewGestureControllercpp">trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm">trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (160629 => 160630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-16 06:34:24 UTC (rev 160629)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-16 06:39:18 UTC (rev 160630)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2013-12-15 Tim Horton <timothy_horton@apple.com>
+
+ WebKit2 View Gestures: Can't pinch in past the maximum scale
+ https://bugs.webkit.org/show_bug.cgi?id=125749
+
+ Reviewed by Anders Carlsson.
+
+ Pinching in past the maximum scale should result in the zoom resisting, but continuing.
+
+ * UIProcess/mac/ViewGestureController.cpp:
+ (WebKit::resistanceForDelta):
+ Clean up the logic and apply resistance to pinching in past the maximum.
+
+ (WebKit::ViewGestureController::handleMagnificationGesture):
+ (WebKit::ViewGestureController::endMagnificationGesture):
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+ (WebKit::TiledCoreAnimationDrawingArea::commitTransientZoom):
+
</ins><span class="cx"> 2013-12-15 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> [Cocoa] Expose the certificate chain for the main frame
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacViewGestureControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.cpp (160629 => 160630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.cpp 2013-12-16 06:34:24 UTC (rev 160629)
+++ trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.cpp 2013-12-16 06:39:18 UTC (rev 160630)
</span><span class="lines">@@ -32,9 +32,12 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><del>-static const double minMagnification = 0.75;
</del><ins>+static const double minMagnification = 1;
</ins><span class="cx"> static const double maxMagnification = 3;
</span><span class="cx">
</span><ins>+static const double minElasticMagnification = 0.75;
+static const double maxElasticMagnification = 4;
+
</ins><span class="cx"> static const double zoomOutBoost = 1.6;
</span><span class="cx"> static const double zoomOutResistance = 0.10;
</span><span class="cx">
</span><span class="lines">@@ -55,18 +58,18 @@
</span><span class="cx">
</span><span class="cx"> static double resistanceForDelta(double deltaScale, double currentScale)
</span><span class="cx"> {
</span><del>- // Zoom in with no acceleration.
- // FIXME: Should have resistance when zooming in past the limit.
- if (deltaScale > 0)
</del><ins>+ // Zoom out with slight acceleration, until we reach minimum scale.
+ if (deltaScale < 0 && currentScale > minMagnification)
+ return zoomOutBoost;
+
+ // Zoom in with no acceleration, until we reach maximum scale.
+ if (deltaScale > 0 && currentScale < maxMagnification)
</ins><span class="cx"> return 1;
</span><span class="cx">
</span><del>- // Zoom out with slight acceleration, until we reach unit scale.
- if (currentScale > 1)
- return zoomOutBoost;
-
- // Beyond scale=1, resist zooming out.
- double scaleDistance = minMagnification - currentScale;
- double scalePercent = std::min(std::max(scaleDistance / minMagnification, 0.), 1.);
</del><ins>+ // Outside of the extremes, resist further scaling.
+ double limit = currentScale < minMagnification ? minMagnification : maxMagnification;
+ double scaleDistance = abs(limit - currentScale);
+ double scalePercent = std::min(std::max(scaleDistance / limit, 0.), 1.);
</ins><span class="cx"> double resistance = zoomOutResistance + scalePercent * (0.01 - zoomOutResistance);
</span><span class="cx">
</span><span class="cx"> return resistance;
</span><span class="lines">@@ -106,7 +109,7 @@
</span><span class="cx"> double scaleWithResistance = resistanceForDelta(scale, m_magnification) * scale;
</span><span class="cx">
</span><span class="cx"> m_magnification += m_magnification * scaleWithResistance;
</span><del>- m_magnification = std::min(std::max(m_magnification, minMagnification), maxMagnification);
</del><ins>+ m_magnification = std::min(std::max(m_magnification, minElasticMagnification), maxElasticMagnification);
</ins><span class="cx">
</span><span class="cx"> m_magnificationOrigin = origin;
</span><span class="cx">
</span><span class="lines">@@ -120,7 +123,7 @@
</span><span class="cx"> ASSERT(m_activeGestureType == ViewGestureType::Magnification);
</span><span class="cx">
</span><span class="cx"> // FIXME: Should rubber-band back when zoomed in or out past the limit.
</span><del>- double newMagnification = std::max(m_magnification, 1.);
</del><ins>+ double newMagnification = std::min(std::max(m_magnification, minMagnification), maxMagnification);
</ins><span class="cx">
</span><span class="cx"> FloatPoint scaledOrigin = scaledMagnificationOrigin(m_magnificationOrigin, newMagnification);
</span><span class="cx"> scaledOrigin.moveBy(-m_visibleContentRect.location());
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (160629 => 160630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2013-12-16 06:34:24 UTC (rev 160629)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2013-12-16 06:39:18 UTC (rev 160630)
</span><span class="lines">@@ -738,9 +738,10 @@
</span><span class="cx"> RenderView* renderView = m_webPage->corePage()->mainFrame().view()->renderView();
</span><span class="cx">
</span><span class="cx"> // If the page scale is already the target scale, scalePage() will short-circuit
</span><del>- // and not apply the transform, so we can't clear it.
- if (m_transientZoomScale != m_webPage->pageScaleFactor())
- static_cast<GraphicsLayerCA*>(renderView->layer()->backing()->graphicsLayer())->platformCALayer()->setTransform(TransformationMatrix());
</del><ins>+ // and not apply the transform, so we can't depend on it to do so.
+ TransformationMatrix transform;
+ transform.scale(scale);
+ static_cast<GraphicsLayerCA*>(renderView->layer()->backing()->graphicsLayer())->platformCALayer()->setTransform(transform);
</ins><span class="cx">
</span><span class="cx"> PlatformCALayer* shadowLayer = static_cast<GraphicsLayerCA*>(renderView->compositor().layerForContentShadow())->platformCALayer();
</span><span class="cx"> shadowLayer->setHidden(false);
</span></span></pre>
</div>
</div>
</body>
</html>