<!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>[201493] trunk/Source</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/201493">201493</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-05-28 21:20:06 -0700 (Sat, 28 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Templatize NoncopyableFunction class similarly to std::function
https://bugs.webkit.org/show_bug.cgi?id=158185
Reviewed by Darin Adler.
Templatize NoncopyableFunction class similarly to std::function, so
that it can be used as a std::function replacement in more places.
Previously, NoncopyableFunction could only support "void()" lambdas.
Source/WebCore:
* Modules/mediastream/MediaEndpointPeerConnection.cpp:
(WebCore::MediaEndpointPeerConnection::runTask):
* Modules/mediastream/MediaEndpointPeerConnection.h:
* fileapi/AsyncFileStream.cpp:
(WebCore::callOnFileThread):
(WebCore::AsyncFileStream::perform):
(WebCore::AsyncFileStream::getSize):
(WebCore::AsyncFileStream::openForRead):
(WebCore::AsyncFileStream::openForWrite):
(WebCore::AsyncFileStream::write):
* fileapi/AsyncFileStream.h:
* page/scrolling/ScrollingThread.cpp:
(WebCore::ScrollingThread::dispatch):
(WebCore::ScrollingThread::dispatchBarrier):
(WebCore::ScrollingThread::dispatchFunctionsFromScrollingThread):
* page/scrolling/ScrollingThread.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::scheduleDeferredTask):
* platform/mediastream/MediaStreamPrivate.cpp:
(WebCore::MediaStreamPrivate::scheduleDeferredTask):
* platform/mediastream/MediaStreamPrivate.h:
* platform/mediastream/mac/AVMediaCaptureSource.h:
* platform/mediastream/mac/AVMediaCaptureSource.mm:
(WebCore::AVMediaCaptureSource::scheduleDeferredTask):
Source/WebKit:
* Storage/StorageSyncManager.cpp:
(WebCore::StorageSyncManager::dispatch):
* Storage/StorageSyncManager.h:
* Storage/StorageThread.cpp:
(WebCore::StorageThread::dispatch):
(WebCore::StorageThread::terminate):
* Storage/StorageThread.h:
Source/WebKit2:
* NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp:
(WebKit::NetworkCache::runTaskInQueue):
Source/WTF:
* wtf/FunctionDispatcher.h:
* wtf/MainThread.cpp:
(WTF::functionQueue):
(WTF::dispatchFunctionsFromMainThread):
(WTF::callOnMainThread):
* wtf/MainThread.h:
* wtf/NoncopyableFunction.h:
* wtf/RunLoop.cpp:
(WTF::RunLoop::performWork):
(WTF::RunLoop::dispatch):
* wtf/RunLoop.h:
* wtf/WorkQueue.h:
* wtf/cocoa/WorkQueueCocoa.cpp:
(WTF::WorkQueue::dispatch):
(WTF::WorkQueue::dispatchAfter):
* wtf/efl/DispatchQueueWorkItemEfl.h:
(WorkItem::WorkItem):
(TimerWorkItem::create):
(TimerWorkItem::TimerWorkItem):
* wtf/efl/WorkQueueEfl.cpp:
(WTF::WorkQueue::dispatch):
(WTF::WorkQueue::dispatchAfter):
* wtf/generic/RunLoopGeneric.cpp:
(WTF::RunLoop::TimerBase::ScheduledTask::create):
(WTF::RunLoop::TimerBase::ScheduledTask::ScheduledTask):
(WTF::RunLoop::dispatchAfter):
* wtf/generic/WorkQueueGeneric.cpp:
(WorkQueue::dispatch):
(WorkQueue::dispatchAfter):
* wtf/glib/RunLoopGLib.cpp:
(WTF::DispatchAfterContext::DispatchAfterContext):
(WTF::RunLoop::dispatchAfter):
* wtf/win/WorkItemWin.cpp:
(WTF::WorkItemWin::WorkItemWin):
(WTF::WorkItemWin::create):
(WTF::HandleWorkItem::HandleWorkItem):
(WTF::HandleWorkItem::createByAdoptingHandle):
* wtf/win/WorkItemWin.h:
(WTF::WorkItemWin::function):
* wtf/win/WorkQueueWin.cpp:
(WTF::WorkQueue::dispatch):
(WTF::WorkQueue::dispatchAfter):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfFunctionDispatcherh">trunk/Source/WTF/wtf/FunctionDispatcher.h</a></li>
<li><a href="#trunkSourceWTFwtfMainThreadcpp">trunk/Source/WTF/wtf/MainThread.cpp</a></li>
<li><a href="#trunkSourceWTFwtfMainThreadh">trunk/Source/WTF/wtf/MainThread.h</a></li>
<li><a href="#trunkSourceWTFwtfNoncopyableFunctionh">trunk/Source/WTF/wtf/NoncopyableFunction.h</a></li>
<li><a href="#trunkSourceWTFwtfRunLoopcpp">trunk/Source/WTF/wtf/RunLoop.cpp</a></li>
<li><a href="#trunkSourceWTFwtfRunLooph">trunk/Source/WTF/wtf/RunLoop.h</a></li>
<li><a href="#trunkSourceWTFwtfWorkQueueh">trunk/Source/WTF/wtf/WorkQueue.h</a></li>
<li><a href="#trunkSourceWTFwtfcocoaWorkQueueCocoacpp">trunk/Source/WTF/wtf/cocoa/WorkQueueCocoa.cpp</a></li>
<li><a href="#trunkSourceWTFwtfeflDispatchQueueWorkItemEflh">trunk/Source/WTF/wtf/efl/DispatchQueueWorkItemEfl.h</a></li>
<li><a href="#trunkSourceWTFwtfeflWorkQueueEflcpp">trunk/Source/WTF/wtf/efl/WorkQueueEfl.cpp</a></li>
<li><a href="#trunkSourceWTFwtfgenericRunLoopGenericcpp">trunk/Source/WTF/wtf/generic/RunLoopGeneric.cpp</a></li>
<li><a href="#trunkSourceWTFwtfgenericWorkQueueGenericcpp">trunk/Source/WTF/wtf/generic/WorkQueueGeneric.cpp</a></li>
<li><a href="#trunkSourceWTFwtfglibRunLoopGLibcpp">trunk/Source/WTF/wtf/glib/RunLoopGLib.cpp</a></li>
<li><a href="#trunkSourceWTFwtfwinWorkItemWincpp">trunk/Source/WTF/wtf/win/WorkItemWin.cpp</a></li>
<li><a href="#trunkSourceWTFwtfwinWorkItemWinh">trunk/Source/WTF/wtf/win/WorkItemWin.h</a></li>
<li><a href="#trunkSourceWTFwtfwinWorkQueueWincpp">trunk/Source/WTF/wtf/win/WorkQueueWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaEndpointPeerConnectioncpp">trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaEndpointPeerConnectionh">trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.h</a></li>
<li><a href="#trunkSourceWebCorefileapiAsyncFileStreamcpp">trunk/Source/WebCore/fileapi/AsyncFileStream.cpp</a></li>
<li><a href="#trunkSourceWebCorefileapiAsyncFileStreamh">trunk/Source/WebCore/fileapi/AsyncFileStream.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingThreadcpp">trunk/Source/WebCore/page/scrolling/ScrollingThread.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingThreadh">trunk/Source/WebCore/page/scrolling/ScrollingThread.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaStreamAVFObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaStreamAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaStreamPrivatecpp">trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaStreamPrivateh">trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacAVMediaCaptureSourceh">trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacAVMediaCaptureSourcemm">trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitStorageStorageSyncManagercpp">trunk/Source/WebKit/Storage/StorageSyncManager.cpp</a></li>
<li><a href="#trunkSourceWebKitStorageStorageSyncManagerh">trunk/Source/WebKit/Storage/StorageSyncManager.h</a></li>
<li><a href="#trunkSourceWebKitStorageStorageThreadcpp">trunk/Source/WebKit/Storage/StorageThread.cpp</a></li>
<li><a href="#trunkSourceWebKitStorageStorageThreadh">trunk/Source/WebKit/Storage/StorageThread.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheIOChannelSoupcpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (201492 => 201493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-05-28 23:16:50 UTC (rev 201492)
+++ trunk/Source/WTF/ChangeLog 2016-05-29 04:20:06 UTC (rev 201493)
</span><span class="lines">@@ -1,3 +1,58 @@
</span><ins>+2016-05-28 Chris Dumez <cdumez@apple.com>
+
+ Templatize NoncopyableFunction class similarly to std::function
+ https://bugs.webkit.org/show_bug.cgi?id=158185
+
+ Reviewed by Darin Adler.
+
+ Templatize NoncopyableFunction class similarly to std::function, so
+ that it can be used as a std::function replacement in more places.
+
+ Previously, NoncopyableFunction could only support "void()" lambdas.
+
+ * wtf/FunctionDispatcher.h:
+ * wtf/MainThread.cpp:
+ (WTF::functionQueue):
+ (WTF::dispatchFunctionsFromMainThread):
+ (WTF::callOnMainThread):
+ * wtf/MainThread.h:
+ * wtf/NoncopyableFunction.h:
+ * wtf/RunLoop.cpp:
+ (WTF::RunLoop::performWork):
+ (WTF::RunLoop::dispatch):
+ * wtf/RunLoop.h:
+ * wtf/WorkQueue.h:
+ * wtf/cocoa/WorkQueueCocoa.cpp:
+ (WTF::WorkQueue::dispatch):
+ (WTF::WorkQueue::dispatchAfter):
+ * wtf/efl/DispatchQueueWorkItemEfl.h:
+ (WorkItem::WorkItem):
+ (TimerWorkItem::create):
+ (TimerWorkItem::TimerWorkItem):
+ * wtf/efl/WorkQueueEfl.cpp:
+ (WTF::WorkQueue::dispatch):
+ (WTF::WorkQueue::dispatchAfter):
+ * wtf/generic/RunLoopGeneric.cpp:
+ (WTF::RunLoop::TimerBase::ScheduledTask::create):
+ (WTF::RunLoop::TimerBase::ScheduledTask::ScheduledTask):
+ (WTF::RunLoop::dispatchAfter):
+ * wtf/generic/WorkQueueGeneric.cpp:
+ (WorkQueue::dispatch):
+ (WorkQueue::dispatchAfter):
+ * wtf/glib/RunLoopGLib.cpp:
+ (WTF::DispatchAfterContext::DispatchAfterContext):
+ (WTF::RunLoop::dispatchAfter):
+ * wtf/win/WorkItemWin.cpp:
+ (WTF::WorkItemWin::WorkItemWin):
+ (WTF::WorkItemWin::create):
+ (WTF::HandleWorkItem::HandleWorkItem):
+ (WTF::HandleWorkItem::createByAdoptingHandle):
+ * wtf/win/WorkItemWin.h:
+ (WTF::WorkItemWin::function):
+ * wtf/win/WorkQueueWin.cpp:
+ (WTF::WorkQueue::dispatch):
+ (WTF::WorkQueue::dispatchAfter):
+
</ins><span class="cx"> 2016-05-28 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Build fix for projects that include MainThread.h without including FastMalloc.h.
</span></span></pre></div>
<a id="trunkSourceWTFwtfFunctionDispatcherh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/FunctionDispatcher.h (201492 => 201493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/FunctionDispatcher.h 2016-05-28 23:16:50 UTC (rev 201492)
+++ trunk/Source/WTF/wtf/FunctionDispatcher.h 2016-05-29 04:20:06 UTC (rev 201493)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> public:
</span><span class="cx"> WTF_EXPORT_PRIVATE virtual ~FunctionDispatcher();
</span><span class="cx">
</span><del>- virtual void dispatch(NoncopyableFunction&&) = 0;
</del><ins>+ virtual void dispatch(NoncopyableFunction<void ()>&&) = 0;
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> WTF_EXPORT_PRIVATE FunctionDispatcher();
</span></span></pre></div>
<a id="trunkSourceWTFwtfMainThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/MainThread.cpp (201492 => 201493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/MainThread.cpp 2016-05-28 23:16:50 UTC (rev 201492)
+++ trunk/Source/WTF/wtf/MainThread.cpp 2016-05-29 04:20:06 UTC (rev 201493)
</span><span class="lines">@@ -47,9 +47,9 @@
</span><span class="cx">
</span><span class="cx"> static StaticLock mainThreadFunctionQueueMutex;
</span><span class="cx">
</span><del>-static Deque<NoncopyableFunction>& functionQueue()
</del><ins>+static Deque<NoncopyableFunction<void ()>>& functionQueue()
</ins><span class="cx"> {
</span><del>- static NeverDestroyed<Deque<NoncopyableFunction>> functionQueue;
</del><ins>+ static NeverDestroyed<Deque<NoncopyableFunction<void ()>>> functionQueue;
</ins><span class="cx"> return functionQueue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx">
</span><span class="cx"> auto startTime = std::chrono::steady_clock::now();
</span><span class="cx">
</span><del>- NoncopyableFunction function;
</del><ins>+ NoncopyableFunction<void ()> function;
</ins><span class="cx">
</span><span class="cx"> while (true) {
</span><span class="cx"> {
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void callOnMainThread(NoncopyableFunction&& function)
</del><ins>+void callOnMainThread(NoncopyableFunction<void ()>&& function)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(function);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfMainThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/MainThread.h (201492 => 201493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/MainThread.h 2016-05-28 23:16:50 UTC (rev 201492)
+++ trunk/Source/WTF/wtf/MainThread.h 2016-05-29 04:20:06 UTC (rev 201493)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> // Must be called from the main thread.
</span><span class="cx"> WTF_EXPORT_PRIVATE void initializeMainThread();
</span><span class="cx">
</span><del>-WTF_EXPORT_PRIVATE void callOnMainThread(NoncopyableFunction&&);
</del><ins>+WTF_EXPORT_PRIVATE void callOnMainThread(NoncopyableFunction<void ()>&&);
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> WTF_EXPORT_PRIVATE void callOnWebThreadOrDispatchAsyncOnMainThread(void (^block)());
</span></span></pre></div>
<a id="trunkSourceWTFwtfNoncopyableFunctionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/NoncopyableFunction.h (201492 => 201493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/NoncopyableFunction.h 2016-05-28 23:16:50 UTC (rev 201492)
+++ trunk/Source/WTF/wtf/NoncopyableFunction.h 2016-05-29 04:20:06 UTC (rev 201493)
</span><span class="lines">@@ -30,8 +30,10 @@
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span><del>-// FIXME: We could make this templated to support other lambdas than void() and make this more reusable.
-class NoncopyableFunction {
</del><ins>+template<typename> class NoncopyableFunction;
+
+template <typename Out, typename... In>
+class NoncopyableFunction<Out(In...)> {
</ins><span class="cx"> public:
</span><span class="cx"> NoncopyableFunction() = default;
</span><span class="cx">
</span><span class="lines">@@ -41,10 +43,11 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void operator()() const
</del><ins>+ Out operator()(In... in) const
</ins><span class="cx"> {
</span><span class="cx"> if (m_callableWrapper)
</span><del>- m_callableWrapper->call();
</del><ins>+ return m_callableWrapper->call(std::forward<In>(in)...);
+ return Out();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> explicit operator bool() const { return !!m_callableWrapper; }
</span><span class="lines">@@ -68,11 +71,11 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~CallableWrapperBase() { }
</span><span class="cx">
</span><del>- virtual void call() = 0;
</del><ins>+ virtual Out call(In...) = 0;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<typename CallableType>
</span><del>- class CallableWrapper final : public CallableWrapperBase {
</del><ins>+ class CallableWrapper : public CallableWrapperBase {
</ins><span class="cx"> public:
</span><span class="cx"> explicit CallableWrapper(CallableType&& callable)
</span><span class="cx"> : m_callable(WTFMove(callable))
</span><span class="lines">@@ -82,7 +85,7 @@
</span><span class="cx"> CallableWrapper(const CallableWrapper&) = delete;
</span><span class="cx"> CallableWrapper& operator=(const CallableWrapper&) = delete;
</span><span class="cx">
</span><del>- void call() final { m_callable(); }
</del><ins>+ Out call(In... in) final { return m_callable(std::forward<In>(in)...); }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> CallableType m_callable;
</span></span></pre></div>
<a id="trunkSourceWTFwtfRunLoopcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/RunLoop.cpp (201492 => 201493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/RunLoop.cpp 2016-05-28 23:16:50 UTC (rev 201492)
+++ trunk/Source/WTF/wtf/RunLoop.cpp 2016-05-29 04:20:06 UTC (rev 201493)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx">
</span><span class="cx"> size_t functionsToHandle = 0;
</span><span class="cx"> {
</span><del>- NoncopyableFunction function;
</del><ins>+ NoncopyableFunction<void ()> function;
</ins><span class="cx"> {
</span><span class="cx"> MutexLocker locker(m_functionQueueLock);
</span><span class="cx"> functionsToHandle = m_functionQueue.size();
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for (size_t functionsHandled = 1; functionsHandled < functionsToHandle; ++functionsHandled) {
</span><del>- NoncopyableFunction function;
</del><ins>+ NoncopyableFunction<void ()> function;
</ins><span class="cx"> {
</span><span class="cx"> MutexLocker locker(m_functionQueueLock);
</span><span class="cx">
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RunLoop::dispatch(NoncopyableFunction&& function)
</del><ins>+void RunLoop::dispatch(NoncopyableFunction<void ()>&& function)
</ins><span class="cx"> {
</span><span class="cx"> {
</span><span class="cx"> MutexLocker locker(m_functionQueueLock);
</span></span></pre></div>
<a id="trunkSourceWTFwtfRunLooph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/RunLoop.h (201492 => 201493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/RunLoop.h 2016-05-28 23:16:50 UTC (rev 201492)
+++ trunk/Source/WTF/wtf/RunLoop.h 2016-05-29 04:20:06 UTC (rev 201493)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> WTF_EXPORT_PRIVATE static bool isMain();
</span><span class="cx"> ~RunLoop();
</span><span class="cx">
</span><del>- void dispatch(NoncopyableFunction&&) override;
</del><ins>+ void dispatch(NoncopyableFunction<void ()>&&) override;
</ins><span class="cx">
</span><span class="cx"> WTF_EXPORT_PRIVATE static void run();
</span><span class="cx"> WTF_EXPORT_PRIVATE void stop();
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if USE(GLIB_EVENT_LOOP) || USE(GENERIC_EVENT_LOOP)
</span><del>- WTF_EXPORT_PRIVATE void dispatchAfter(std::chrono::nanoseconds, NoncopyableFunction&&);
</del><ins>+ WTF_EXPORT_PRIVATE void dispatchAfter(std::chrono::nanoseconds, NoncopyableFunction<void ()>&&);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> class TimerBase {
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx"> void performWork();
</span><span class="cx">
</span><span class="cx"> Mutex m_functionQueueLock;
</span><del>- Deque<NoncopyableFunction> m_functionQueue;
</del><ins>+ Deque<NoncopyableFunction<void ()>> m_functionQueue;
</ins><span class="cx">
</span><span class="cx"> #if USE(WINDOWS_EVENT_LOOP)
</span><span class="cx"> static bool registerRunLoopMessageWindowClass();
</span></span></pre></div>
<a id="trunkSourceWTFwtfWorkQueueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/WorkQueue.h (201492 => 201493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/WorkQueue.h 2016-05-28 23:16:50 UTC (rev 201492)
+++ trunk/Source/WTF/wtf/WorkQueue.h 2016-05-29 04:20:06 UTC (rev 201493)
</span><span class="lines">@@ -72,8 +72,8 @@
</span><span class="cx"> WTF_EXPORT_PRIVATE static Ref<WorkQueue> create(const char* name, Type = Type::Serial, QOS = QOS::Default);
</span><span class="cx"> virtual ~WorkQueue();
</span><span class="cx">
</span><del>- WTF_EXPORT_PRIVATE void dispatch(NoncopyableFunction&&) override;
- WTF_EXPORT_PRIVATE void dispatchAfter(std::chrono::nanoseconds, NoncopyableFunction&&);
</del><ins>+ WTF_EXPORT_PRIVATE void dispatch(NoncopyableFunction<void ()>&&) override;
+ WTF_EXPORT_PRIVATE void dispatchAfter(std::chrono::nanoseconds, NoncopyableFunction<void ()>&&);
</ins><span class="cx">
</span><span class="cx"> WTF_EXPORT_PRIVATE static void concurrentApply(size_t iterations, const std::function<void (size_t index)>&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfcocoaWorkQueueCocoacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/cocoa/WorkQueueCocoa.cpp (201492 => 201493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/cocoa/WorkQueueCocoa.cpp 2016-05-28 23:16:50 UTC (rev 201492)
+++ trunk/Source/WTF/wtf/cocoa/WorkQueueCocoa.cpp 2016-05-29 04:20:06 UTC (rev 201493)
</span><span class="lines">@@ -28,10 +28,10 @@
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span><del>-void WorkQueue::dispatch(NoncopyableFunction&& function)
</del><ins>+void WorkQueue::dispatch(NoncopyableFunction<void ()>&& function)
</ins><span class="cx"> {
</span><span class="cx"> ref();
</span><del>- auto* functionPtr = new NoncopyableFunction(WTFMove(function));
</del><ins>+ auto* functionPtr = new NoncopyableFunction<void ()>(WTFMove(function));
</ins><span class="cx"> dispatch_async(m_dispatchQueue, ^{
</span><span class="cx"> (*functionPtr)();
</span><span class="cx"> delete functionPtr;
</span><span class="lines">@@ -39,10 +39,10 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkQueue::dispatchAfter(std::chrono::nanoseconds duration, NoncopyableFunction&& function)
</del><ins>+void WorkQueue::dispatchAfter(std::chrono::nanoseconds duration, NoncopyableFunction<void ()>&& function)
</ins><span class="cx"> {
</span><span class="cx"> ref();
</span><del>- auto* functionPtr = new NoncopyableFunction(WTFMove(function));
</del><ins>+ auto* functionPtr = new NoncopyableFunction<void ()>(WTFMove(function));
</ins><span class="cx"> dispatch_after(dispatch_time(DISPATCH_TIME_NOW, duration.count()), m_dispatchQueue, ^{
</span><span class="cx"> (*functionPtr)();
</span><span class="cx"> delete functionPtr;
</span></span></pre></div>
<a id="trunkSourceWTFwtfeflDispatchQueueWorkItemEflh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/efl/DispatchQueueWorkItemEfl.h (201492 => 201493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/efl/DispatchQueueWorkItemEfl.h 2016-05-28 23:16:50 UTC (rev 201492)
+++ trunk/Source/WTF/wtf/efl/DispatchQueueWorkItemEfl.h 2016-05-29 04:20:06 UTC (rev 201493)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">
</span><span class="cx"> class WorkItem {
</span><span class="cx"> public:
</span><del>- WorkItem(Ref<WorkQueue>&& workQueue, NoncopyableFunction&& function)
</del><ins>+ WorkItem(Ref<WorkQueue>&& workQueue, NoncopyableFunction<void ()>&& function)
</ins><span class="cx"> : m_workQueue(WTFMove(workQueue))
</span><span class="cx"> , m_function(WTFMove(function))
</span><span class="cx"> {
</span><span class="lines">@@ -44,12 +44,12 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> Ref<WorkQueue> m_workQueue;
</span><del>- NoncopyableFunction m_function;
</del><ins>+ NoncopyableFunction<void ()> m_function;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class TimerWorkItem : public WorkItem {
</span><span class="cx"> public:
</span><del>- static std::unique_ptr<TimerWorkItem> create(Ref<WorkQueue>&& workQueue, NoncopyableFunction&& function, std::chrono::nanoseconds delayNanoSeconds)
</del><ins>+ static std::unique_ptr<TimerWorkItem> create(Ref<WorkQueue>&& workQueue, NoncopyableFunction<void ()>&& function, std::chrono::nanoseconds delayNanoSeconds)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(delayNanoSeconds.count() >= 0);
</span><span class="cx"> return std::unique_ptr<TimerWorkItem>(new TimerWorkItem(WTFMove(workQueue), WTFMove(function), monotonicallyIncreasingTime() * 1000000000.0 + delayNanoSeconds.count()));
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> bool hasExpired(double currentTimeNanoSeconds) const { return currentTimeNanoSeconds >= m_expirationTimeNanoSeconds; }
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- TimerWorkItem(Ref<WorkQueue>&& workQueue, NoncopyableFunction&& function, double expirationTimeNanoSeconds)
</del><ins>+ TimerWorkItem(Ref<WorkQueue>&& workQueue, NoncopyableFunction<void ()>&& function, double expirationTimeNanoSeconds)
</ins><span class="cx"> : WorkItem(WTFMove(workQueue), WTFMove(function))
</span><span class="cx"> , m_expirationTimeNanoSeconds(expirationTimeNanoSeconds)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWTFwtfeflWorkQueueEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/efl/WorkQueueEfl.cpp (201492 => 201493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/efl/WorkQueueEfl.cpp 2016-05-28 23:16:50 UTC (rev 201492)
+++ trunk/Source/WTF/wtf/efl/WorkQueueEfl.cpp 2016-05-29 04:20:06 UTC (rev 201493)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> m_dispatchQueue->clearSocketEventHandler();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkQueue::dispatch(NoncopyableFunction&& function)
</del><ins>+void WorkQueue::dispatch(NoncopyableFunction<void ()>&& function)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_dispatchQueue)
</span><span class="cx"> return;
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> m_dispatchQueue->dispatch(std::make_unique<WorkItem>(*this, WTFMove(function)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkQueue::dispatchAfter(std::chrono::nanoseconds duration, NoncopyableFunction&& function)
</del><ins>+void WorkQueue::dispatchAfter(std::chrono::nanoseconds duration, NoncopyableFunction<void ()>&& function)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_dispatchQueue)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWTFwtfgenericRunLoopGenericcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/generic/RunLoopGeneric.cpp (201492 => 201493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/generic/RunLoopGeneric.cpp 2016-05-28 23:16:50 UTC (rev 201492)
+++ trunk/Source/WTF/wtf/generic/RunLoopGeneric.cpp 2016-05-29 04:20:06 UTC (rev 201493)
</span><span class="lines">@@ -32,12 +32,12 @@
</span><span class="cx"> class RunLoop::TimerBase::ScheduledTask : public ThreadSafeRefCounted<ScheduledTask> {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(ScheduledTask);
</span><span class="cx"> public:
</span><del>- static RefPtr<ScheduledTask> create(NoncopyableFunction&& function, double interval, bool repeating)
</del><ins>+ static RefPtr<ScheduledTask> create(NoncopyableFunction<void ()>&& function, double interval, bool repeating)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(new ScheduledTask(WTFMove(function), interval, repeating));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ScheduledTask(NoncopyableFunction&& function, double interval, bool repeating)
</del><ins>+ ScheduledTask(NoncopyableFunction<void ()>&& function, double interval, bool repeating)
</ins><span class="cx"> : m_function(WTFMove(function))
</span><span class="cx"> , m_fireInterval(std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::duration<double>(interval)))
</span><span class="cx"> , m_isRepeating(repeating)
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- NoncopyableFunction m_function;
</del><ins>+ NoncopyableFunction<void ()> m_function;
</ins><span class="cx"> Condition::Clock::time_point m_scheduledTimePoint;
</span><span class="cx"> std::chrono::microseconds m_fireInterval;
</span><span class="cx"> std::atomic<bool> m_isActive { true };
</span><span class="lines">@@ -237,7 +237,7 @@
</span><span class="cx"> wakeUp(locker);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RunLoop::dispatchAfter(std::chrono::nanoseconds delay, NoncopyableFunction&& function)
</del><ins>+void RunLoop::dispatchAfter(std::chrono::nanoseconds delay, NoncopyableFunction<void ()>&& function)
</ins><span class="cx"> {
</span><span class="cx"> LockHolder locker(m_loopLock);
</span><span class="cx"> bool repeating = false;
</span></span></pre></div>
<a id="trunkSourceWTFwtfgenericWorkQueueGenericcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/generic/WorkQueueGeneric.cpp (201492 => 201493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/generic/WorkQueueGeneric.cpp 2016-05-28 23:16:50 UTC (rev 201492)
+++ trunk/Source/WTF/wtf/generic/WorkQueueGeneric.cpp 2016-05-29 04:20:06 UTC (rev 201493)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkQueue::dispatch(NoncopyableFunction&& function)
</del><ins>+void WorkQueue::dispatch(NoncopyableFunction<void ()>&& function)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<WorkQueue> protect(this);
</span><span class="cx"> m_runLoop->dispatch([protect, function = WTFMove(function)] {
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkQueue::dispatchAfter(std::chrono::nanoseconds delay, NoncopyableFunction&& function)
</del><ins>+void WorkQueue::dispatchAfter(std::chrono::nanoseconds delay, NoncopyableFunction<void ()>&& function)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<WorkQueue> protect(this);
</span><span class="cx"> m_runLoop->dispatchAfter(delay, [protect, function = WTFMove(function)] {
</span></span></pre></div>
<a id="trunkSourceWTFwtfglibRunLoopGLibcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/glib/RunLoopGLib.cpp (201492 => 201493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/glib/RunLoopGLib.cpp 2016-05-28 23:16:50 UTC (rev 201492)
+++ trunk/Source/WTF/wtf/glib/RunLoopGLib.cpp 2016-05-29 04:20:06 UTC (rev 201493)
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> class DispatchAfterContext {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- DispatchAfterContext(NoncopyableFunction&& function)
</del><ins>+ DispatchAfterContext(NoncopyableFunction<void ()>&& function)
</ins><span class="cx"> : m_function(WTFMove(function))
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -135,10 +135,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- NoncopyableFunction m_function;
</del><ins>+ NoncopyableFunction<void ()> m_function;
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-void RunLoop::dispatchAfter(std::chrono::nanoseconds duration, NoncopyableFunction&& function)
</del><ins>+void RunLoop::dispatchAfter(std::chrono::nanoseconds duration, NoncopyableFunction<void ()>&& function)
</ins><span class="cx"> {
</span><span class="cx"> GRefPtr<GSource> source = adoptGRef(g_timeout_source_new(std::chrono::duration_cast<std::chrono::milliseconds>(duration).count()));
</span><span class="cx"> g_source_set_name(source.get(), "[WebKit] RunLoop dispatchAfter");
</span></span></pre></div>
<a id="trunkSourceWTFwtfwinWorkItemWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/win/WorkItemWin.cpp (201492 => 201493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/win/WorkItemWin.cpp 2016-05-28 23:16:50 UTC (rev 201492)
+++ trunk/Source/WTF/wtf/win/WorkItemWin.cpp 2016-05-29 04:20:06 UTC (rev 201493)
</span><span class="lines">@@ -32,13 +32,13 @@
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span><del>-WorkItemWin::WorkItemWin(NoncopyableFunction&& function, WorkQueue* queue)
</del><ins>+WorkItemWin::WorkItemWin(NoncopyableFunction<void ()>&& function, WorkQueue* queue)
</ins><span class="cx"> : m_function(WTFMove(function))
</span><span class="cx"> , m_queue(queue)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<WorkItemWin> WorkItemWin::create(NoncopyableFunction&& function, WorkQueue* queue)
</del><ins>+RefPtr<WorkItemWin> WorkItemWin::create(NoncopyableFunction<void ()>&& function, WorkQueue* queue)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(new WorkItemWin(WTFMove(function), queue));
</span><span class="cx"> }
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HandleWorkItem::HandleWorkItem(HANDLE handle, NoncopyableFunction&& function, WorkQueue* queue)
</del><ins>+HandleWorkItem::HandleWorkItem(HANDLE handle, NoncopyableFunction<void ()>&& function, WorkQueue* queue)
</ins><span class="cx"> : WorkItemWin(WTFMove(function), queue)
</span><span class="cx"> , m_handle(handle)
</span><span class="cx"> , m_waitHandle(0)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> ASSERT_ARG(handle, handle);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<HandleWorkItem> HandleWorkItem::createByAdoptingHandle(HANDLE handle, NoncopyableFunction&& function, WorkQueue* queue)
</del><ins>+RefPtr<HandleWorkItem> HandleWorkItem::createByAdoptingHandle(HANDLE handle, NoncopyableFunction<void ()>&& function, WorkQueue* queue)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(new HandleWorkItem(handle, WTFMove(function), queue));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWTFwtfwinWorkItemWinh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/win/WorkItemWin.h (201492 => 201493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/win/WorkItemWin.h 2016-05-28 23:16:50 UTC (rev 201492)
+++ trunk/Source/WTF/wtf/win/WorkItemWin.h 2016-05-29 04:20:06 UTC (rev 201493)
</span><span class="lines">@@ -39,30 +39,30 @@
</span><span class="cx">
</span><span class="cx"> class WorkItemWin : public ThreadSafeRefCounted<WorkItemWin> {
</span><span class="cx"> public:
</span><del>- static RefPtr<WorkItemWin> create(NoncopyableFunction&&, WorkQueue*);
</del><ins>+ static RefPtr<WorkItemWin> create(NoncopyableFunction<void ()>&&, WorkQueue*);
</ins><span class="cx"> virtual ~WorkItemWin();
</span><span class="cx">
</span><del>- NoncopyableFunction& function() { return m_function; }
</del><ins>+ NoncopyableFunction<void ()>& function() { return m_function; }
</ins><span class="cx"> WorkQueue* queue() const { return m_queue.get(); }
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- WorkItemWin(NoncopyableFunction&&, WorkQueue*);
</del><ins>+ WorkItemWin(NoncopyableFunction<void ()>&&, WorkQueue*);
</ins><span class="cx">
</span><span class="cx"> private:
</span><del>- NoncopyableFunction m_function;
</del><ins>+ NoncopyableFunction<void ()> m_function;
</ins><span class="cx"> RefPtr<WorkQueue> m_queue;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class HandleWorkItem : public WorkItemWin {
</span><span class="cx"> public:
</span><del>- static RefPtr<HandleWorkItem> createByAdoptingHandle(HANDLE, NoncopyableFunction&&, WorkQueue*);
</del><ins>+ static RefPtr<HandleWorkItem> createByAdoptingHandle(HANDLE, NoncopyableFunction<void ()>&&, WorkQueue*);
</ins><span class="cx"> virtual ~HandleWorkItem();
</span><span class="cx">
</span><span class="cx"> void setWaitHandle(HANDLE waitHandle) { m_waitHandle = waitHandle; }
</span><span class="cx"> HANDLE waitHandle() const { return m_waitHandle; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- HandleWorkItem(HANDLE, NoncopyableFunction&&, WorkQueue*);
</del><ins>+ HandleWorkItem(HANDLE, NoncopyableFunction<void ()>&&, WorkQueue*);
</ins><span class="cx">
</span><span class="cx"> HANDLE m_handle;
</span><span class="cx"> HANDLE m_waitHandle;
</span></span></pre></div>
<a id="trunkSourceWTFwtfwinWorkQueueWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/win/WorkQueueWin.cpp (201492 => 201493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/win/WorkQueueWin.cpp 2016-05-28 23:16:50 UTC (rev 201492)
+++ trunk/Source/WTF/wtf/win/WorkQueueWin.cpp 2016-05-29 04:20:06 UTC (rev 201493)
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> ::DeleteTimerQueueEx(m_timerQueue, 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkQueue::dispatch(NoncopyableFunction&& function)
</del><ins>+void WorkQueue::dispatch(NoncopyableFunction<void ()>&& function)
</ins><span class="cx"> {
</span><span class="cx"> MutexLocker locker(m_workItemQueueLock);
</span><span class="cx"> ref();
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx"> static RefPtr<TimerContext> create() { return adoptRef(new TimerContext); }
</span><span class="cx">
</span><span class="cx"> WorkQueue* queue;
</span><del>- NoncopyableFunction function;
</del><ins>+ NoncopyableFunction<void ()> function;
</ins><span class="cx"> Mutex timerMutex;
</span><span class="cx"> HANDLE timer;
</span><span class="cx">
</span><span class="lines">@@ -180,7 +180,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkQueue::dispatchAfter(std::chrono::nanoseconds duration, NoncopyableFunction&& function)
</del><ins>+void WorkQueue::dispatchAfter(std::chrono::nanoseconds duration, NoncopyableFunction<void ()>&& function)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_timerQueue);
</span><span class="cx"> ref();
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201492 => 201493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-28 23:16:50 UTC (rev 201492)
+++ trunk/Source/WebCore/ChangeLog 2016-05-29 04:20:06 UTC (rev 201493)
</span><span class="lines">@@ -1,3 +1,41 @@
</span><ins>+2016-05-28 Chris Dumez <cdumez@apple.com>
+
+ Templatize NoncopyableFunction class similarly to std::function
+ https://bugs.webkit.org/show_bug.cgi?id=158185
+
+ Reviewed by Darin Adler.
+
+ Templatize NoncopyableFunction class similarly to std::function, so
+ that it can be used as a std::function replacement in more places.
+
+ Previously, NoncopyableFunction could only support "void()" lambdas.
+
+ * Modules/mediastream/MediaEndpointPeerConnection.cpp:
+ (WebCore::MediaEndpointPeerConnection::runTask):
+ * Modules/mediastream/MediaEndpointPeerConnection.h:
+ * fileapi/AsyncFileStream.cpp:
+ (WebCore::callOnFileThread):
+ (WebCore::AsyncFileStream::perform):
+ (WebCore::AsyncFileStream::getSize):
+ (WebCore::AsyncFileStream::openForRead):
+ (WebCore::AsyncFileStream::openForWrite):
+ (WebCore::AsyncFileStream::write):
+ * fileapi/AsyncFileStream.h:
+ * page/scrolling/ScrollingThread.cpp:
+ (WebCore::ScrollingThread::dispatch):
+ (WebCore::ScrollingThread::dispatchBarrier):
+ (WebCore::ScrollingThread::dispatchFunctionsFromScrollingThread):
+ * page/scrolling/ScrollingThread.h:
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h:
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::scheduleDeferredTask):
+ * platform/mediastream/MediaStreamPrivate.cpp:
+ (WebCore::MediaStreamPrivate::scheduleDeferredTask):
+ * platform/mediastream/MediaStreamPrivate.h:
+ * platform/mediastream/mac/AVMediaCaptureSource.h:
+ * platform/mediastream/mac/AVMediaCaptureSource.mm:
+ (WebCore::AVMediaCaptureSource::scheduleDeferredTask):
+
</ins><span class="cx"> 2016-05-28 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix the build with newer clang and other custom configuration options
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaEndpointPeerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp (201492 => 201493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp 2016-05-28 23:16:50 UTC (rev 201492)
+++ trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp 2016-05-29 04:20:06 UTC (rev 201493)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> m_mediaEndpoint->generateDtlsInfo();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaEndpointPeerConnection::runTask(NoncopyableFunction&& task)
</del><ins>+void MediaEndpointPeerConnection::runTask(NoncopyableFunction<void ()>&& task)
</ins><span class="cx"> {
</span><span class="cx"> if (m_dtlsFingerprint.isNull()) {
</span><span class="cx"> // Only one task needs to be deferred since it will hold off any others until completed.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaEndpointPeerConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.h (201492 => 201493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.h 2016-05-28 23:16:50 UTC (rev 201492)
+++ trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.h 2016-05-29 04:20:06 UTC (rev 201493)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> void clearNegotiationNeededState() override { notImplemented(); };
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- void runTask(NoncopyableFunction&&);
</del><ins>+ void runTask(NoncopyableFunction<void ()>&&);
</ins><span class="cx"> void startRunningTasks();
</span><span class="cx">
</span><span class="cx"> void createOfferTask(RTCOfferOptions&, PeerConnection::SessionDescriptionPromise&);
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> PeerConnectionBackendClient* m_client;
</span><span class="cx"> std::unique_ptr<MediaEndpoint> m_mediaEndpoint;
</span><span class="cx">
</span><del>- NoncopyableFunction m_initialDeferredTask;
</del><ins>+ NoncopyableFunction<void ()> m_initialDeferredTask;
</ins><span class="cx">
</span><span class="cx"> std::unique_ptr<SDPProcessor> m_sdpProcessor;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiAsyncFileStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/AsyncFileStream.cpp (201492 => 201493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/AsyncFileStream.cpp 2016-05-28 23:16:50 UTC (rev 201492)
+++ trunk/Source/WebCore/fileapi/AsyncFileStream.cpp 2016-05-29 04:20:06 UTC (rev 201493)
</span><span class="lines">@@ -64,12 +64,12 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void callOnFileThread(NoncopyableFunction&& function)
</del><ins>+static void callOnFileThread(NoncopyableFunction<void ()>&& function)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> ASSERT(function);
</span><span class="cx">
</span><del>- static NeverDestroyed<MessageQueue<NoncopyableFunction>> queue;
</del><ins>+ static NeverDestroyed<MessageQueue<NoncopyableFunction<void ()>>> queue;
</ins><span class="cx">
</span><span class="cx"> static std::once_flag createFileThreadOnce;
</span><span class="cx"> std::call_once(createFileThreadOnce, [] {
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span><del>- queue.get().append(std::make_unique<NoncopyableFunction>(WTFMove(function)));
</del><ins>+ queue.get().append(std::make_unique<NoncopyableFunction<void ()>>(WTFMove(function)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> AsyncFileStream::AsyncFileStream(FileStreamClient& client)
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void AsyncFileStream::perform(std::function<std::function<void(FileStreamClient&)>(FileStream&)>&& operation)
</del><ins>+void AsyncFileStream::perform(NoncopyableFunction<std::function<void(FileStreamClient&)>(FileStream&)>&& operation)
</ins><span class="cx"> {
</span><span class="cx"> auto& internals = *m_internals;
</span><span class="cx"> callOnFileThread([&internals, operation = WTFMove(operation)] {
</span><span class="lines">@@ -134,11 +134,10 @@
</span><span class="cx">
</span><span class="cx"> void AsyncFileStream::getSize(const String& path, double expectedModificationTime)
</span><span class="cx"> {
</span><del>- StringCapture capturedPath(path);
</del><span class="cx"> // FIXME: Explicit return type here and in all the other cases like this below is a workaround for a deficiency
</span><span class="cx"> // in the Windows compiler at the time of this writing. Could remove it if that is resolved.
</span><del>- perform([capturedPath, expectedModificationTime](FileStream& stream) -> std::function<void(FileStreamClient&)> {
- long long size = stream.getSize(capturedPath.string(), expectedModificationTime);
</del><ins>+ perform([path = path.isolatedCopy(), expectedModificationTime](FileStream& stream) -> std::function<void(FileStreamClient&)> {
+ long long size = stream.getSize(path, expectedModificationTime);
</ins><span class="cx"> return [size](FileStreamClient& client) {
</span><span class="cx"> client.didGetSize(size);
</span><span class="cx"> };
</span><span class="lines">@@ -147,10 +146,9 @@
</span><span class="cx">
</span><span class="cx"> void AsyncFileStream::openForRead(const String& path, long long offset, long long length)
</span><span class="cx"> {
</span><del>- StringCapture capturedPath(path);
</del><span class="cx"> // FIXME: Explicit return type here is a workaround for a deficiency in the Windows compiler at the time of this writing.
</span><del>- perform([capturedPath, offset, length](FileStream& stream) -> std::function<void(FileStreamClient&)> {
- bool success = stream.openForRead(capturedPath.string(), offset, length);
</del><ins>+ perform([path = path.isolatedCopy(), offset, length](FileStream& stream) -> std::function<void(FileStreamClient&)> {
+ bool success = stream.openForRead(path, offset, length);
</ins><span class="cx"> return [success](FileStreamClient& client) {
</span><span class="cx"> client.didOpen(success);
</span><span class="cx"> };
</span><span class="lines">@@ -159,9 +157,8 @@
</span><span class="cx">
</span><span class="cx"> void AsyncFileStream::openForWrite(const String& path)
</span><span class="cx"> {
</span><del>- StringCapture capturedPath(path);
- perform([capturedPath](FileStream& stream) -> std::function<void(FileStreamClient&)> {
- bool success = stream.openForWrite(capturedPath.string());
</del><ins>+ perform([path = path.isolatedCopy()](FileStream& stream) -> std::function<void(FileStreamClient&)> {
+ bool success = stream.openForWrite(path);
</ins><span class="cx"> return [success](FileStreamClient& client) {
</span><span class="cx"> client.didOpen(success);
</span><span class="cx"> };
</span><span class="lines">@@ -188,9 +185,8 @@
</span><span class="cx">
</span><span class="cx"> void AsyncFileStream::write(const URL& blobURL, long long position, int length)
</span><span class="cx"> {
</span><del>- URLCapture capturedURL(blobURL);
- perform([capturedURL, position, length](FileStream& stream) -> std::function<void(FileStreamClient&)> {
- int bytesWritten = stream.write(capturedURL.url(), position, length);
</del><ins>+ perform([blobURL = blobURL.isolatedCopy(), position, length](FileStream& stream) -> std::function<void(FileStreamClient&)> {
+ int bytesWritten = stream.write(blobURL, position, length);
</ins><span class="cx"> return [bytesWritten](FileStreamClient& client) {
</span><span class="cx"> client.didWrite(bytesWritten);
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiAsyncFileStreamh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/AsyncFileStream.h (201492 => 201493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/AsyncFileStream.h 2016-05-28 23:16:50 UTC (rev 201492)
+++ trunk/Source/WebCore/fileapi/AsyncFileStream.h 2016-05-29 04:20:06 UTC (rev 201493)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx">
</span><span class="cx"> #include <functional>
</span><span class="cx"> #include <wtf/Forward.h>
</span><ins>+#include <wtf/NoncopyableFunction.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -56,7 +57,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void start();
</span><del>- void perform(std::function<std::function<void(FileStreamClient&)>(FileStream&)>&&);
</del><ins>+ void perform(NoncopyableFunction<std::function<void(FileStreamClient&)>(FileStream&)>&&);
</ins><span class="cx">
</span><span class="cx"> struct Internals;
</span><span class="cx"> std::unique_ptr<Internals> m_internals;
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingThread.cpp (201492 => 201493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingThread.cpp 2016-05-28 23:16:50 UTC (rev 201492)
+++ trunk/Source/WebCore/page/scrolling/ScrollingThread.cpp 2016-05-29 04:20:06 UTC (rev 201493)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> return threadIdentifier && currentThread() == threadIdentifier;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingThread::dispatch(NoncopyableFunction&& function)
</del><ins>+void ScrollingThread::dispatch(NoncopyableFunction<void ()>&& function)
</ins><span class="cx"> {
</span><span class="cx"> auto& scrollingThread = ScrollingThread::singleton();
</span><span class="cx"> scrollingThread.createThreadIfNeeded();
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> scrollingThread.wakeUpRunLoop();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingThread::dispatchBarrier(NoncopyableFunction&& function)
</del><ins>+void ScrollingThread::dispatchBarrier(NoncopyableFunction<void ()>&& function)
</ins><span class="cx"> {
</span><span class="cx"> dispatch([function = WTFMove(function)]() mutable {
</span><span class="cx"> callOnMainThread(WTFMove(function));
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isCurrentThread());
</span><span class="cx">
</span><del>- Vector<NoncopyableFunction> functions;
</del><ins>+ Vector<NoncopyableFunction<void ()>> functions;
</ins><span class="cx">
</span><span class="cx"> {
</span><span class="cx"> std::lock_guard<Lock> lock(m_functionsMutex);
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingThread.h (201492 => 201493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingThread.h 2016-05-28 23:16:50 UTC (rev 201492)
+++ trunk/Source/WebCore/page/scrolling/ScrollingThread.h 2016-05-29 04:20:06 UTC (rev 201493)
</span><span class="lines">@@ -48,11 +48,11 @@
</span><span class="cx">
</span><span class="cx"> public:
</span><span class="cx"> static bool isCurrentThread();
</span><del>- WEBCORE_EXPORT static void dispatch(NoncopyableFunction&&);
</del><ins>+ WEBCORE_EXPORT static void dispatch(NoncopyableFunction<void ()>&&);
</ins><span class="cx">
</span><span class="cx"> // Will dispatch the given function on the main thread once all pending functions
</span><span class="cx"> // on the scrolling thread have finished executing. Used for synchronization purposes.
</span><del>- WEBCORE_EXPORT static void dispatchBarrier(NoncopyableFunction&&);
</del><ins>+ WEBCORE_EXPORT static void dispatchBarrier(NoncopyableFunction<void ()>&&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> friend NeverDestroyed<ScrollingThread>;
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> Lock m_initializeRunLoopMutex;
</span><span class="cx">
</span><span class="cx"> Lock m_functionsMutex;
</span><del>- Vector<NoncopyableFunction> m_functions;
</del><ins>+ Vector<NoncopyableFunction<void ()>> m_functions;
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> // FIXME: We should use WebCore::RunLoop here.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaStreamAVFObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h (201492 => 201493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h 2016-05-28 23:16:50 UTC (rev 201492)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h 2016-05-29 04:20:06 UTC (rev 201493)
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx"> void updateTracks();
</span><span class="cx"> void renderingModeChanged();
</span><span class="cx">
</span><del>- void scheduleDeferredTask(NoncopyableFunction&&);
</del><ins>+ void scheduleDeferredTask(NoncopyableFunction<void ()>&&);
</ins><span class="cx">
</span><span class="cx"> enum DisplayMode {
</span><span class="cx"> None,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaStreamAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm (201492 => 201493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm 2016-05-28 23:16:50 UTC (rev 201492)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm 2016-05-29 04:20:06 UTC (rev 201493)
</span><span class="lines">@@ -624,7 +624,7 @@
</span><span class="cx"> m_player->networkStateChanged();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlayerPrivateMediaStreamAVFObjC::scheduleDeferredTask(NoncopyableFunction&& function)
</del><ins>+void MediaPlayerPrivateMediaStreamAVFObjC::scheduleDeferredTask(NoncopyableFunction<void ()>&& function)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(function);
</span><span class="cx"> callOnMainThread([weakThis = createWeakPtr(), function = WTFMove(function)] {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamPrivatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp (201492 => 201493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp 2016-05-28 23:16:50 UTC (rev 201492)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp 2016-05-29 04:20:06 UTC (rev 201493)
</span><span class="lines">@@ -299,7 +299,7 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaStreamPrivate::scheduleDeferredTask(NoncopyableFunction&& function)
</del><ins>+void MediaStreamPrivate::scheduleDeferredTask(NoncopyableFunction<void ()>&& function)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(function);
</span><span class="cx"> callOnMainThread([weakThis = createWeakPtr(), function = WTFMove(function)] {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h (201492 => 201493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h 2016-05-28 23:16:50 UTC (rev 201492)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h 2016-05-29 04:20:06 UTC (rev 201493)
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> void characteristicsChanged();
</span><span class="cx"> void updateActiveVideoTrack();
</span><span class="cx">
</span><del>- void scheduleDeferredTask(NoncopyableFunction&&);
</del><ins>+ void scheduleDeferredTask(NoncopyableFunction<void ()>&&);
</ins><span class="cx">
</span><span class="cx"> WeakPtrFactory<MediaStreamPrivate> m_weakPtrFactory;
</span><span class="cx"> Vector<Observer*> m_observers;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacAVMediaCaptureSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.h (201492 => 201493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.h 2016-05-28 23:16:50 UTC (rev 201492)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.h 2016-05-29 04:20:06 UTC (rev 201493)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> void setVideoSampleBufferDelegate(AVCaptureVideoDataOutput*);
</span><span class="cx"> void setAudioSampleBufferDelegate(AVCaptureAudioDataOutput*);
</span><span class="cx">
</span><del>- void scheduleDeferredTask(NoncopyableFunction&&);
</del><ins>+ void scheduleDeferredTask(NoncopyableFunction<void ()>&&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void setupSession();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacAVMediaCaptureSourcemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm (201492 => 201493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm 2016-05-28 23:16:50 UTC (rev 201492)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm 2016-05-29 04:20:06 UTC (rev 201493)
</span><span class="lines">@@ -240,7 +240,7 @@
</span><span class="cx"> [audioOutput setSampleBufferDelegate:m_objcObserver.get() queue:globaAudioCaptureSerialQueue()];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void AVMediaCaptureSource::scheduleDeferredTask(NoncopyableFunction&& function)
</del><ins>+void AVMediaCaptureSource::scheduleDeferredTask(NoncopyableFunction<void ()>&& function)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(function);
</span><span class="cx"> callOnMainThread([weakThis = createWeakPtr(), function = WTFMove(function)] {
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (201492 => 201493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2016-05-28 23:16:50 UTC (rev 201492)
+++ trunk/Source/WebKit/ChangeLog 2016-05-29 04:20:06 UTC (rev 201493)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-05-28 Chris Dumez <cdumez@apple.com>
+
+ Templatize NoncopyableFunction class similarly to std::function
+ https://bugs.webkit.org/show_bug.cgi?id=158185
+
+ Reviewed by Darin Adler.
+
+ Templatize NoncopyableFunction class similarly to std::function, so
+ that it can be used as a std::function replacement in more places.
+
+ Previously, NoncopyableFunction could only support "void()" lambdas.
+
+ * Storage/StorageSyncManager.cpp:
+ (WebCore::StorageSyncManager::dispatch):
+ * Storage/StorageSyncManager.h:
+ * Storage/StorageThread.cpp:
+ (WebCore::StorageThread::dispatch):
+ (WebCore::StorageThread::terminate):
+ * Storage/StorageThread.h:
+
</ins><span class="cx"> 2016-05-27 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> callOnMainThread() should not copy captured lambda variables
</span></span></pre></div>
<a id="trunkSourceWebKitStorageStorageSyncManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Storage/StorageSyncManager.cpp (201492 => 201493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Storage/StorageSyncManager.cpp 2016-05-28 23:16:50 UTC (rev 201492)
+++ trunk/Source/WebKit/Storage/StorageSyncManager.cpp 2016-05-29 04:20:06 UTC (rev 201493)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> return pathByAppendingComponent(m_path, databaseIdentifier + ".localstorage");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StorageSyncManager::dispatch(NoncopyableFunction&& function)
</del><ins>+void StorageSyncManager::dispatch(NoncopyableFunction<void ()>&& function)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> ASSERT(m_thread);
</span></span></pre></div>
<a id="trunkSourceWebKitStorageStorageSyncManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Storage/StorageSyncManager.h (201492 => 201493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Storage/StorageSyncManager.h 2016-05-28 23:16:50 UTC (rev 201492)
+++ trunk/Source/WebKit/Storage/StorageSyncManager.h 2016-05-29 04:20:06 UTC (rev 201493)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> static Ref<StorageSyncManager> create(const String& path);
</span><span class="cx"> ~StorageSyncManager();
</span><span class="cx">
</span><del>- void dispatch(NoncopyableFunction&&);
</del><ins>+ void dispatch(NoncopyableFunction<void ()>&&);
</ins><span class="cx"> void close();
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebKitStorageStorageThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Storage/StorageThread.cpp (201492 => 201493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Storage/StorageThread.cpp 2016-05-28 23:16:50 UTC (rev 201492)
+++ trunk/Source/WebKit/Storage/StorageThread.cpp 2016-05-29 04:20:06 UTC (rev 201493)
</span><span class="lines">@@ -74,11 +74,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StorageThread::dispatch(NoncopyableFunction&& function)
</del><ins>+void StorageThread::dispatch(NoncopyableFunction<void ()>&& function)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> ASSERT(!m_queue.killed() && m_threadID);
</span><del>- m_queue.append(std::make_unique<NoncopyableFunction>(WTFMove(function)));
</del><ins>+ m_queue.append(std::make_unique<NoncopyableFunction<void ()>>(WTFMove(function)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void StorageThread::terminate()
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> if (!m_threadID)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_queue.append(std::make_unique<NoncopyableFunction>([this] {
</del><ins>+ m_queue.append(std::make_unique<NoncopyableFunction<void ()>>([this] {
</ins><span class="cx"> performTerminate();
</span><span class="cx"> }));
</span><span class="cx"> waitForThreadCompletion(m_threadID);
</span></span></pre></div>
<a id="trunkSourceWebKitStorageStorageThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Storage/StorageThread.h (201492 => 201493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Storage/StorageThread.h 2016-05-28 23:16:50 UTC (rev 201492)
+++ trunk/Source/WebKit/Storage/StorageThread.h 2016-05-29 04:20:06 UTC (rev 201493)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> bool start();
</span><span class="cx"> void terminate();
</span><span class="cx">
</span><del>- void dispatch(NoncopyableFunction&&);
</del><ins>+ void dispatch(NoncopyableFunction<void ()>&&);
</ins><span class="cx">
</span><span class="cx"> static void releaseFastMallocFreeMemoryInAllThreads();
</span><span class="cx">
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> void performTerminate();
</span><span class="cx">
</span><span class="cx"> ThreadIdentifier m_threadID;
</span><del>- MessageQueue<NoncopyableFunction> m_queue;
</del><ins>+ MessageQueue<NoncopyableFunction<void ()>> m_queue;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (201492 => 201493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-05-28 23:16:50 UTC (rev 201492)
+++ trunk/Source/WebKit2/ChangeLog 2016-05-29 04:20:06 UTC (rev 201493)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-05-28 Chris Dumez <cdumez@apple.com>
+
+ Templatize NoncopyableFunction class similarly to std::function
+ https://bugs.webkit.org/show_bug.cgi?id=158185
+
+ Reviewed by Darin Adler.
+
+ Templatize NoncopyableFunction class similarly to std::function, so
+ that it can be used as a std::function replacement in more places.
+
+ Previously, NoncopyableFunction could only support "void()" lambdas.
+
+ * NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp:
+ (WebKit::NetworkCache::runTaskInQueue):
+
</ins><span class="cx"> 2016-05-28 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix the build with newer clang and other custom configuration options
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheIOChannelSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp (201492 => 201493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp 2016-05-28 23:16:50 UTC (rev 201492)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp 2016-05-29 04:20:06 UTC (rev 201493)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> return adoptRef(*new IOChannel(filePath, type));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline void runTaskInQueue(NoncopyableFunction&& task, WorkQueue* queue)
</del><ins>+static inline void runTaskInQueue(NoncopyableFunction<void ()>&& task, WorkQueue* queue)
</ins><span class="cx"> {
</span><span class="cx"> if (queue) {
</span><span class="cx"> queue->dispatch(WTFMove(task));
</span></span></pre>
</div>
</div>
</body>
</html>