<!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>[205496] 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/205496">205496</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2016-09-06 11:38:15 -0700 (Tue, 06 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove SwipeTransitionStyle; only Overlap has ever been used
https://bugs.webkit.org/show_bug.cgi?id=161617
Reviewed by Alex Christensen.
* UIProcess/mac/ViewGestureController.h:
* UIProcess/mac/ViewGestureControllerMac.mm:
(WebKit::ViewGestureController::beginSwipeGesture):
(WebKit::ViewGestureController::handleSwipeGesture):
Remove SwipeTransitionStyle::Push, and SwipeTransitionStyle itself entirely,
because we've never used it and it is only supported by the Mac
implementation of ViewGestureController.</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="#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 (205495 => 205496)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-09-06 18:21:26 UTC (rev 205495)
+++ trunk/Source/WebKit2/ChangeLog 2016-09-06 18:38:15 UTC (rev 205496)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-09-06 Tim Horton <timothy_horton@apple.com>
+
+ Remove SwipeTransitionStyle; only Overlap has ever been used
+ https://bugs.webkit.org/show_bug.cgi?id=161617
+
+ Reviewed by Alex Christensen.
+
+ * UIProcess/mac/ViewGestureController.h:
+ * UIProcess/mac/ViewGestureControllerMac.mm:
+ (WebKit::ViewGestureController::beginSwipeGesture):
+ (WebKit::ViewGestureController::handleSwipeGesture):
+ Remove SwipeTransitionStyle::Push, and SwipeTransitionStyle itself entirely,
+ because we've never used it and it is only supported by the Mac
+ implementation of ViewGestureController.
+
</ins><span class="cx"> 2016-09-06 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove EXTERN_C from WTF
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacViewGestureControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.h (205495 => 205496)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.h 2016-09-06 18:21:26 UTC (rev 205495)
+++ trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.h 2016-09-06 18:38:15 UTC (rev 205496)
</span><span class="lines">@@ -78,12 +78,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> Swipe
</span><span class="cx"> };
</span><del>-
- enum class SwipeTransitionStyle {
- Overlap,
- Push
- };
-
</del><ins>+
</ins><span class="cx"> enum class SwipeDirection {
</span><span class="cx"> Back,
</span><span class="cx"> Forward
</span><span class="lines">@@ -264,7 +259,6 @@
</span><span class="cx"> RetainPtr<CALayer> m_swipeDimmingLayer;
</span><span class="cx"> Vector<RetainPtr<CALayer>> m_currentSwipeLiveLayers;
</span><span class="cx">
</span><del>- SwipeTransitionStyle m_swipeTransitionStyle { SwipeTransitionStyle::Overlap };
</del><span class="cx"> Vector<RetainPtr<NSView>> m_customSwipeViews;
</span><span class="cx"> float m_customSwipeViewsTopContentInset { 0 };
</span><span class="cx"> WebCore::FloatRect m_currentSwipeCustomViewBounds;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacViewGestureControllerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm (205495 => 205496)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm 2016-09-06 18:21:26 UTC (rev 205495)
+++ trunk/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm 2016-09-06 18:38:15 UTC (rev 205496)
</span><span class="lines">@@ -608,7 +608,7 @@
</span><span class="cx"> [snapshotLayerParent insertSublayer:m_swipeLayer.get() above:layerAdjacentToSnapshot];
</span><span class="cx">
</span><span class="cx"> // We don't know enough about the custom views' hierarchy to apply a shadow.
</span><del>- if (m_swipeTransitionStyle == SwipeTransitionStyle::Overlap && m_customSwipeViews.isEmpty()) {
</del><ins>+ if (m_customSwipeViews.isEmpty()) {
</ins><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">@@ -711,23 +711,14 @@
</span><span class="cx"> else
</span><span class="cx"> [m_swipeShadowLayer setOpacity:swipeOverlayShadowOpacity];
</span><span class="cx">
</span><del>- if (m_swipeTransitionStyle == SwipeTransitionStyle::Overlap)
- [m_swipeShadowLayer setTransform:CATransform3DMakeTranslation((swipingLeft ? 0 : width) + swipingLayerOffset, 0, 0)];
</del><ins>+ [m_swipeShadowLayer setTransform:CATransform3DMakeTranslation((swipingLeft ? 0 : width) + swipingLayerOffset, 0, 0)];
</ins><span class="cx">
</span><del>- if (m_swipeTransitionStyle == SwipeTransitionStyle::Overlap) {
- if (!swipingLeft) {
- [m_swipeLayer setTransform:CATransform3DMakeTranslation(width + swipingLayerOffset, 0, 0)];
- didMoveSwipeSnapshotLayer();
- }
- } else if (m_swipeTransitionStyle == SwipeTransitionStyle::Push)
- [m_swipeLayer setTransform:CATransform3DMakeTranslation((swipingLeft ? -width : width) + swipingLayerOffset, 0, 0)];
-
- for (const auto& layer : m_currentSwipeLiveLayers) {
- if (m_swipeTransitionStyle == SwipeTransitionStyle::Overlap) {
- if (swipingLeft)
- [layer setTransform:CATransform3DMakeTranslation(swipingLayerOffset, 0, 0)];
- } else if (m_swipeTransitionStyle == SwipeTransitionStyle::Push)
</del><ins>+ if (swipingLeft) {
+ for (const auto& layer : m_currentSwipeLiveLayers)
</ins><span class="cx"> [layer setTransform:CATransform3DMakeTranslation(swipingLayerOffset, 0, 0)];
</span><ins>+ } else {
+ [m_swipeLayer setTransform:CATransform3DMakeTranslation(width + swipingLayerOffset, 0, 0)];
+ didMoveSwipeSnapshotLayer();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>