<!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>[206930] 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/206930">206930</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2016-10-07 13:25:07 -0700 (Fri, 07 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Adopt BlockPtr in ViewGestureController
https://bugs.webkit.org/show_bug.cgi?id=163132
Reviewed by Anders Carlsson.
* UIProcess/Cocoa/WebViewImpl.h:
* UIProcess/Cocoa/WebViewImpl.mm:
(WebKit::WebViewImpl::setDidMoveSwipeSnapshotCallback):
* UIProcess/ViewGestureController.cpp:
(WebKit::ViewGestureController::SnapshotRemovalTracker::stopWaitingForEvent):
* UIProcess/mac/ViewGestureController.h:
(WebKit::ViewGestureController::setDidMoveSwipeSnapshotCallback):
(WebKit::ViewGestureController::m_didMoveSwipeSnapshotCallback): Deleted.
* UIProcess/mac/ViewGestureControllerMac.mm:
(WebKit::ViewGestureController::platformTeardown):
(WebKit::ViewGestureController::setDidMoveSwipeSnapshotCallback): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebViewImplh">trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebViewImplmm">trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessViewGestureControllercpp">trunk/Source/WebKit2/UIProcess/ViewGestureController.cpp</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 (206929 => 206930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-10-07 20:04:46 UTC (rev 206929)
+++ trunk/Source/WebKit2/ChangeLog 2016-10-07 20:25:07 UTC (rev 206930)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-10-07 Tim Horton <timothy_horton@apple.com>
+
+ Adopt BlockPtr in ViewGestureController
+ https://bugs.webkit.org/show_bug.cgi?id=163132
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/Cocoa/WebViewImpl.h:
+ * UIProcess/Cocoa/WebViewImpl.mm:
+ (WebKit::WebViewImpl::setDidMoveSwipeSnapshotCallback):
+ * UIProcess/ViewGestureController.cpp:
+ (WebKit::ViewGestureController::SnapshotRemovalTracker::stopWaitingForEvent):
+ * UIProcess/mac/ViewGestureController.h:
+ (WebKit::ViewGestureController::setDidMoveSwipeSnapshotCallback):
+ (WebKit::ViewGestureController::m_didMoveSwipeSnapshotCallback): Deleted.
+ * UIProcess/mac/ViewGestureControllerMac.mm:
+ (WebKit::ViewGestureController::platformTeardown):
+ (WebKit::ViewGestureController::setDidMoveSwipeSnapshotCallback): Deleted.
+
</ins><span class="cx"> 2016-10-07 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Get rid of WKPageSetSession
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebViewImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h (206929 => 206930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h 2016-10-07 20:04:46 UTC (rev 206929)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h 2016-10-07 20:25:07 UTC (rev 206930)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include <WebCore/TextIndicatorWindow.h>
</span><span class="cx"> #include <WebCore/UserInterfaceLayoutDirection.h>
</span><span class="cx"> #include <functional>
</span><ins>+#include <wtf/BlockPtr.h>
</ins><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #include <wtf/WeakPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -418,7 +419,7 @@
</span><span class="cx"> void setCustomSwipeViews(NSArray *);
</span><span class="cx"> void setCustomSwipeViewsTopContentInset(float);
</span><span class="cx"> bool tryToSwipeWithEvent(NSEvent *, bool ignoringPinnedState);
</span><del>- void setDidMoveSwipeSnapshotCallback(void(^)(CGRect));
</del><ins>+ void setDidMoveSwipeSnapshotCallback(BlockPtr<void (CGRect)>&&);
</ins><span class="cx">
</span><span class="cx"> void scrollWheel(NSEvent *);
</span><span class="cx"> void swipeWithEvent(NSEvent *);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebViewImplmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm (206929 => 206930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2016-10-07 20:04:46 UTC (rev 206929)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2016-10-07 20:25:07 UTC (rev 206930)
</span><span class="lines">@@ -3276,12 +3276,12 @@
</span><span class="cx"> return handledEvent;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebViewImpl::setDidMoveSwipeSnapshotCallback(void(^callback)(CGRect))
</del><ins>+void WebViewImpl::setDidMoveSwipeSnapshotCallback(BlockPtr<void (CGRect)>&& callback)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_allowsBackForwardNavigationGestures)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ensureGestureController().setDidMoveSwipeSnapshotCallback(callback);
</del><ins>+ ensureGestureController().setDidMoveSwipeSnapshotCallback(WTFMove(callback));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebViewImpl::scrollWheel(NSEvent *event)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessViewGestureControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ViewGestureController.cpp (206929 => 206930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ViewGestureController.cpp 2016-10-07 20:04:46 UTC (rev 206929)
+++ trunk/Source/WebKit2/UIProcess/ViewGestureController.cpp 2016-10-07 20:25:07 UTC (rev 206930)
</span><span class="lines">@@ -232,7 +232,7 @@
</span><span class="cx"> #if LOG_DISABLED
</span><span class="cx"> UNUSED_PARAM(logReason);
</span><span class="cx"> #endif
</span><del>- log(logReason + eventsDescription(event));
</del><ins>+ log(logReason + eventsDescription(event));
</ins><span class="cx">
</span><span class="cx"> m_outstandingEvents &= ~event;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacViewGestureControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.h (206929 => 206930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.h 2016-10-07 20:04:46 UTC (rev 206929)
+++ trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.h 2016-10-07 20:25:07 UTC (rev 206930)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include <WebCore/Color.h>
</span><span class="cx"> #include <WebCore/FloatRect.h>
</span><span class="cx"> #include <chrono>
</span><ins>+#include <wtf/BlockPtr.h>
</ins><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #include <wtf/RunLoop.h>
</span><span class="cx">
</span><span class="lines">@@ -100,7 +101,7 @@
</span><span class="cx"> void setCustomSwipeViews(Vector<RetainPtr<NSView>> views) { m_customSwipeViews = WTFMove(views); }
</span><span class="cx"> void setCustomSwipeViewsTopContentInset(float topContentInset) { m_customSwipeViewsTopContentInset = topContentInset; }
</span><span class="cx"> WebCore::FloatRect windowRelativeBoundsForCustomSwipeViews() const;
</span><del>- void setDidMoveSwipeSnapshotCallback(void(^)(CGRect));
</del><ins>+ void setDidMoveSwipeSnapshotCallback(BlockPtr<void (CGRect)>&& callback) { m_didMoveSwipeSnapshotCallback = WTFMove(callback); }
</ins><span class="cx">
</span><span class="cx"> bool shouldIgnorePinnedState() { return m_pendingSwipeTracker.shouldIgnorePinnedState(); }
</span><span class="cx"> void setShouldIgnorePinnedState(bool ignore) { m_pendingSwipeTracker.setShouldIgnorePinnedState(ignore); }
</span><span class="lines">@@ -265,7 +266,7 @@
</span><span class="cx">
</span><span class="cx"> PendingSwipeTracker m_pendingSwipeTracker;
</span><span class="cx">
</span><del>- void (^m_didMoveSwipeSnapshotCallback)(CGRect) { nullptr };
</del><ins>+ BlockPtr<void (CGRect)> m_didMoveSwipeSnapshotCallback;
</ins><span class="cx">
</span><span class="cx"> bool m_hasOutstandingRepaintRequest { false };
</span><span class="cx"> #else
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacViewGestureControllerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm (206929 => 206930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm 2016-10-07 20:04:46 UTC (rev 206929)
+++ trunk/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm 2016-10-07 20:25:07 UTC (rev 206930)
</span><span class="lines">@@ -91,11 +91,6 @@
</span><span class="cx">
</span><span class="cx"> if (m_activeGestureType == ViewGestureType::Swipe)
</span><span class="cx"> removeSwipeSnapshot();
</span><del>-
- if (m_didMoveSwipeSnapshotCallback) {
- Block_release(m_didMoveSwipeSnapshotCallback);
- m_didMoveSwipeSnapshotCallback = nullptr;
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static double resistanceForDelta(double deltaScale, double currentScale)
</span><span class="lines">@@ -722,13 +717,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ViewGestureController::setDidMoveSwipeSnapshotCallback(void(^callback)(CGRect))
-{
- if (m_didMoveSwipeSnapshotCallback)
- Block_release(m_didMoveSwipeSnapshotCallback);
- m_didMoveSwipeSnapshotCallback = Block_copy(callback);
-}
-
</del><span class="cx"> void ViewGestureController::didMoveSwipeSnapshotLayer()
</span><span class="cx"> {
</span><span class="cx"> if (!m_didMoveSwipeSnapshotCallback)
</span></span></pre>
</div>
</div>
</body>
</html>