<!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>[192824] 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/192824">192824</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2015-11-30 13:50:04 -0800 (Mon, 30 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get rid of the legacy swipe shadow style
https://bugs.webkit.org/show_bug.cgi?id=151671
Reviewed by Anders Carlsson.
* UIProcess/mac/ViewGestureControllerMac.mm:
(WebKit::ViewGestureController::beginSwipeGesture): Deleted.
(WebKit::ViewGestureController::handleSwipeGesture): Deleted.
(WebKit::ViewGestureController::removeSwipeSnapshot): Deleted.
It is no longer needed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</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 (192823 => 192824)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-11-30 21:49:47 UTC (rev 192823)
+++ trunk/Source/WebKit2/ChangeLog 2015-11-30 21:50:04 UTC (rev 192824)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2015-11-30 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><ins>+ Get rid of the legacy swipe shadow style
+ https://bugs.webkit.org/show_bug.cgi?id=151671
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/mac/ViewGestureControllerMac.mm:
+ (WebKit::ViewGestureController::beginSwipeGesture): Deleted.
+ (WebKit::ViewGestureController::handleSwipeGesture): Deleted.
+ (WebKit::ViewGestureController::removeSwipeSnapshot): Deleted.
+ It is no longer needed.
+
+2015-11-30 Tim Horton <timothy_horton@apple.com>
+
</ins><span class="cx"> [iOS] Option-up and Option-down should scroll a little less than a full page
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=151538
</span><span class="cx"> <rdar://problem/23642675>
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacViewGestureControllerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm (192823 => 192824)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm 2015-11-30 21:49:47 UTC (rev 192823)
+++ trunk/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm 2015-11-30 21:50:04 UTC (rev 192824)
</span><span class="lines">@@ -48,12 +48,6 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101000
-#define ENABLE_LEGACY_SWIPE_SHADOW_STYLE 1
-#else
-#define ENABLE_LEGACY_SWIPE_SHADOW_STYLE 0
-#endif
-
</del><span class="cx"> static const double minMagnification = 1;
</span><span class="cx"> static const double maxMagnification = 3;
</span><span class="cx">
</span><span class="lines">@@ -66,14 +60,9 @@
</span><span class="cx"> static const float smartMagnificationElementPadding = 0.05;
</span><span class="cx"> static const float smartMagnificationPanScrollThreshold = 100;
</span><span class="cx">
</span><del>-#if ENABLE(LEGACY_SWIPE_SHADOW_STYLE)
-static const double swipeOverlayShadowOpacity = 0.66;
-static const double swipeOverlayShadowRadius = 3;
-#else
</del><span class="cx"> static const double swipeOverlayShadowOpacity = 0.06;
</span><span class="cx"> static const double swipeOverlayDimmingOpacity = 0.12;
</span><span class="cx"> static const CGFloat swipeOverlayShadowWidth = 81;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> static const CGFloat minimumHorizontalSwipeDistance = 15;
</span><span class="cx"> static const float minimumScrollEventRatioForSwipe = 0.5;
</span><span class="lines">@@ -611,23 +600,6 @@
</span><span class="cx">
</span><span class="cx"> // We don't know enough about the custom views' hierarchy to apply a shadow.
</span><span class="cx"> if (m_swipeTransitionStyle == SwipeTransitionStyle::Overlap && m_customSwipeViews.isEmpty()) {
</span><del>-#if ENABLE(LEGACY_SWIPE_SHADOW_STYLE)
- if (direction == SwipeDirection::Back) {
- float topContentInset = m_webPageProxy.topContentInset();
- FloatRect shadowRect(FloatPoint(0, topContentInset), m_webPageProxy.viewSize() - FloatSize(0, topContentInset));
- RetainPtr<CGPathRef> shadowPath = adoptCF(CGPathCreateWithRect(shadowRect, 0));
- [rootContentLayer setShadowColor:CGColorGetConstantColor(kCGColorBlack)];
- [rootContentLayer setShadowOpacity:swipeOverlayShadowOpacity];
- [rootContentLayer setShadowRadius:swipeOverlayShadowRadius];
- [rootContentLayer setShadowPath:shadowPath.get()];
- } else {
- RetainPtr<CGPathRef> shadowPath = adoptCF(CGPathCreateWithRect([m_swipeLayer bounds], 0));
- [m_swipeLayer setShadowColor:CGColorGetConstantColor(kCGColorBlack)];
- [m_swipeLayer setShadowOpacity:swipeOverlayShadowOpacity];
- [m_swipeLayer setShadowRadius:swipeOverlayShadowRadius];
- [m_swipeLayer setShadowPath:shadowPath.get()];
- }
-#else
</del><span class="cx"> FloatRect dimmingRect(FloatPoint(), m_webPageProxy.viewSize());
</span><span class="cx"> m_swipeDimmingLayer = adoptNS([[CALayer alloc] init]);
</span><span class="cx"> [m_swipeDimmingLayer setName:@"Gesture Swipe Dimming Layer"];
</span><span class="lines">@@ -691,7 +663,6 @@
</span><span class="cx"> [snapshotLayerParent insertSublayer:m_swipeDimmingLayer.get() below:m_swipeLayer.get()];
</span><span class="cx">
</span><span class="cx"> [snapshotLayerParent insertSublayer:m_swipeShadowLayer.get() above:m_swipeLayer.get()];
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -710,7 +681,6 @@
</span><span class="cx">
</span><span class="cx"> double swipingLayerOffset = floor(width * progress);
</span><span class="cx">
</span><del>-#if !ENABLE(LEGACY_SWIPE_SHADOW_STYLE)
</del><span class="cx"> double dimmingProgress = (direction == SwipeDirection::Back) ? 1 - progress : -progress;
</span><span class="cx"> dimmingProgress = std::min(1., std::max(dimmingProgress, 0.));
</span><span class="cx"> [m_swipeDimmingLayer setOpacity:dimmingProgress * swipeOverlayDimmingOpacity];
</span><span class="lines">@@ -725,7 +695,6 @@
</span><span class="cx">
</span><span class="cx"> if (m_swipeTransitionStyle == SwipeTransitionStyle::Overlap)
</span><span class="cx"> [m_swipeShadowLayer setTransform:CATransform3DMakeTranslation((direction == SwipeDirection::Back ? 0 : width) + swipingLayerOffset, 0, 0)];
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> if (m_swipeTransitionStyle == SwipeTransitionStyle::Overlap) {
</span><span class="cx"> if (direction == SwipeDirection::Forward) {
</span><span class="lines">@@ -840,13 +809,11 @@
</span><span class="cx"> [m_swipeLayer removeFromSuperlayer];
</span><span class="cx"> m_swipeLayer = nullptr;
</span><span class="cx">
</span><del>-#if !ENABLE(LEGACY_SWIPE_SHADOW_STYLE)
</del><span class="cx"> [m_swipeShadowLayer removeFromSuperlayer];
</span><span class="cx"> m_swipeShadowLayer = nullptr;
</span><span class="cx">
</span><span class="cx"> [m_swipeDimmingLayer removeFromSuperlayer];
</span><span class="cx"> m_swipeDimmingLayer = nullptr;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> m_currentSwipeLiveLayers.clear();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>