<!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>[201464] trunk</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/201464">201464</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-05-27 13:22:12 -0700 (Fri, 27 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>WorkQueue::dispatch() / RunLoop::dispatch() should not copy captured lambda variables
https://bugs.webkit.org/show_bug.cgi?id=158111
Reviewed by Darin Adler.
WorkQueue::dispatch() / RunLoop::dispatch() should not copy captured lambda variables.
These are often used cross-thread and copying the captured lambda variables can be
dangerous (e.g. we do not want to copy a String after calling isolatedCopy() upon
capture).
Source/JavaScriptCore:
* runtime/Watchdog.cpp:
(JSC::Watchdog::startTimer):
(JSC::Watchdog::Watchdog): Deleted.
(JSC::Watchdog::setTimeLimit): Deleted.
* runtime/Watchdog.h:
Source/WebKit2:
* NetworkProcess/NetworkProcess.cpp:
(WebKit::clearDiskCacheEntries):
* NetworkProcess/cache/NetworkCache.cpp:
(WebKit::NetworkCache::Cache::clear):
* NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp:
(WebKit::NetworkCache::runTaskInQueue):
* Platform/IPC/Connection.cpp:
(IPC::Connection::processIncomingMessage):
* UIProcess/Storage/StorageManager.cpp:
(WebKit::StorageManager::getSessionStorageOrigins):
(WebKit::StorageManager::deleteSessionStorageOrigins):
(WebKit::StorageManager::deleteSessionStorageEntriesForOrigins):
(WebKit::StorageManager::getLocalStorageOrigins):
(WebKit::StorageManager::getLocalStorageOriginDetails):
(WebKit::StorageManager::deleteLocalStorageOriginsModifiedSince):
(WebKit::StorageManager::deleteLocalStorageEntriesForOrigins):
* UIProcess/Storage/StorageManager.h:
Source/WTF:
This patch introduces a new NoncopyableFunction type that behaves similarly to
std::function but guarantees that the passed-in lambda (and its captured variables)
cannot be copied. This new NoncopyableFunction type is now used for
WorkQueue / RunLoop's dispatch() / dispatchAfter() which are commonly used
cross-thread. This should now allow us to call WorkQueue::dispatch() with a lambda
that captures a String like so:
[str = str.isolatedCopy()]() { }
Also note that even though this is not leveraged in this patch, NoncopyableFunction
would allow us to capture move-only types such as std::unique_ptr as so:
[p = WTFMove(p)]() { }
This does not work if we convert the lambda into an std::function because
std::function requires the lambda to be copyable, NoncopyableFunction does not.
* wtf/FunctionDispatcher.h:
(WTF::CallableWrapperBase::~CallableWrapperBase):
(WTF::NoncopyableFunction::NoncopyableFunction):
(WTF::NoncopyableFunction::operator()):
(WTF::NoncopyableFunction::operator bool):
(WTF::NoncopyableFunction::operator=):
* 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::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::timerCallback):
(WTF::WorkQueue::dispatchAfter):
Tools:
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::decidePolicyForNavigationAction):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeWatchdogcpp">trunk/Source/JavaScriptCore/runtime/Watchdog.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeWatchdogh">trunk/Source/JavaScriptCore/runtime/Watchdog.h</a></li>
<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="#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="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcesscpp">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCachecpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheIOChannelSoupcpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCConnectioncpp">trunk/Source/WebKit2/Platform/IPC/Connection.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessStorageStorageManagercpp">trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessStorageStorageManagerh">trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestControllercpp">trunk/Tools/WebKitTestRunner/TestController.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (201463 => 201464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-05-27 20:14:16 UTC (rev 201463)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-05-27 20:22:12 UTC (rev 201464)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-05-27 Chris Dumez <cdumez@apple.com>
+
+ WorkQueue::dispatch() / RunLoop::dispatch() should not copy captured lambda variables
+ https://bugs.webkit.org/show_bug.cgi?id=158111
+
+ Reviewed by Darin Adler.
+
+ WorkQueue::dispatch() / RunLoop::dispatch() should not copy captured lambda variables.
+ These are often used cross-thread and copying the captured lambda variables can be
+ dangerous (e.g. we do not want to copy a String after calling isolatedCopy() upon
+ capture).
+
+ * runtime/Watchdog.cpp:
+ (JSC::Watchdog::startTimer):
+ (JSC::Watchdog::Watchdog): Deleted.
+ (JSC::Watchdog::setTimeLimit): Deleted.
+ * runtime/Watchdog.h:
+
</ins><span class="cx"> 2016-05-27 Konstantin Tokarev <annulen@yandex.ru>
</span><span class="cx">
</span><span class="cx"> Removed unused headers from ExecutableAllocatorFixedVMPool.cpp.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeWatchdogcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Watchdog.cpp (201463 => 201464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Watchdog.cpp 2016-05-27 20:14:16 UTC (rev 201463)
+++ trunk/Source/JavaScriptCore/runtime/Watchdog.cpp 2016-05-27 20:22:12 UTC (rev 201464)
</span><span class="lines">@@ -50,13 +50,6 @@
</span><span class="cx"> , m_callbackData2(0)
</span><span class="cx"> , m_timerQueue(WorkQueue::create("jsc.watchdog.queue", WorkQueue::Type::Serial, WorkQueue::QOS::Utility))
</span><span class="cx"> {
</span><del>- m_timerHandler = [this] {
- {
- LockHolder locker(m_lock);
- this->m_timerDidFire = true;
- }
- this->deref();
- };
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Watchdog::setTimeLimit(std::chrono::microseconds limit,
</span><span class="lines">@@ -177,7 +170,13 @@
</span><span class="cx"> this->ref(); // m_timerHandler will deref to match later.
</span><span class="cx"> m_wallClockDeadline = wallClockDeadline;
</span><span class="cx">
</span><del>- m_timerQueue->dispatchAfter(std::chrono::nanoseconds(timeLimit), m_timerHandler);
</del><ins>+ m_timerQueue->dispatchAfter(std::chrono::nanoseconds(timeLimit), [this] {
+ {
+ LockHolder locker(m_lock);
+ m_timerDidFire = true;
+ }
+ deref();
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Watchdog::stopTimer(LockHolder&)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeWatchdogh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Watchdog.h (201463 => 201464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Watchdog.h 2016-05-27 20:14:16 UTC (rev 201463)
+++ trunk/Source/JavaScriptCore/runtime/Watchdog.h 2016-05-27 20:22:12 UTC (rev 201464)
</span><span class="lines">@@ -91,7 +91,6 @@
</span><span class="cx"> void* m_callbackData2;
</span><span class="cx">
</span><span class="cx"> Ref<WorkQueue> m_timerQueue;
</span><del>- std::function<void ()> m_timerHandler;
</del><span class="cx">
</span><span class="cx"> friend class LLIntOffsetsExtractor;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (201463 => 201464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-05-27 20:14:16 UTC (rev 201463)
+++ trunk/Source/WTF/ChangeLog 2016-05-27 20:22:12 UTC (rev 201464)
</span><span class="lines">@@ -1,3 +1,70 @@
</span><ins>+2016-05-27 Chris Dumez <cdumez@apple.com>
+
+ WorkQueue::dispatch() / RunLoop::dispatch() should not copy captured lambda variables
+ https://bugs.webkit.org/show_bug.cgi?id=158111
+
+ Reviewed by Darin Adler.
+
+ WorkQueue::dispatch() / RunLoop::dispatch() should not copy captured lambda variables.
+ These are often used cross-thread and copying the captured lambda variables can be
+ dangerous (e.g. we do not want to copy a String after calling isolatedCopy() upon
+ capture).
+
+ This patch introduces a new NoncopyableFunction type that behaves similarly to
+ std::function but guarantees that the passed-in lambda (and its captured variables)
+ cannot be copied. This new NoncopyableFunction type is now used for
+ WorkQueue / RunLoop's dispatch() / dispatchAfter() which are commonly used
+ cross-thread. This should now allow us to call WorkQueue::dispatch() with a lambda
+ that captures a String like so:
+ [str = str.isolatedCopy()]() { }
+
+ Also note that even though this is not leveraged in this patch, NoncopyableFunction
+ would allow us to capture move-only types such as std::unique_ptr as so:
+ [p = WTFMove(p)]() { }
+ This does not work if we convert the lambda into an std::function because
+ std::function requires the lambda to be copyable, NoncopyableFunction does not.
+
+ * wtf/FunctionDispatcher.h:
+ (WTF::CallableWrapperBase::~CallableWrapperBase):
+ (WTF::NoncopyableFunction::NoncopyableFunction):
+ (WTF::NoncopyableFunction::operator()):
+ (WTF::NoncopyableFunction::operator bool):
+ (WTF::NoncopyableFunction::operator=):
+ * 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::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::timerCallback):
+ (WTF::WorkQueue::dispatchAfter):
+
</ins><span class="cx"> 2016-05-26 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> ScopedLambda should have a lifetime story that makes sense to the compiler
</span></span></pre></div>
<a id="trunkSourceWTFwtfFunctionDispatcherh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/FunctionDispatcher.h (201463 => 201464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/FunctionDispatcher.h 2016-05-27 20:14:16 UTC (rev 201463)
+++ trunk/Source/WTF/wtf/FunctionDispatcher.h 2016-05-27 20:22:12 UTC (rev 201464)
</span><span class="lines">@@ -31,6 +31,62 @@
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span><ins>+// FIXME: Move this to its own header (e.g. Functional.h).
+// FIXME: We could make this templated to support other lambdas than void() and make this more reusable.
+class NoncopyableFunction {
+public:
+ NoncopyableFunction() = default;
+
+ template<typename CallableType, class = typename std::enable_if<std::is_rvalue_reference<CallableType&&>::value>::type>
+ NoncopyableFunction(CallableType&& callable)
+ : m_callableWrapper(std::make_unique<CallableWrapper<CallableType>>(WTFMove(callable)))
+ {
+ }
+
+ void operator()() const
+ {
+ if (m_callableWrapper)
+ m_callableWrapper->call();
+ }
+
+ explicit operator bool() const { return !!m_callableWrapper; }
+
+ template<typename CallableType, class = typename std::enable_if<std::is_rvalue_reference<CallableType&&>::value>::type>
+ NoncopyableFunction& operator=(CallableType&& callable)
+ {
+ m_callableWrapper = std::make_unique<CallableWrapper<CallableType>>(WTFMove(callable));
+ return *this;
+ }
+
+private:
+ class CallableWrapperBase {
+ WTF_MAKE_FAST_ALLOCATED;
+ public:
+ virtual ~CallableWrapperBase() { }
+
+ virtual void call() = 0;
+ };
+
+ template<typename CallableType>
+ class CallableWrapper final : public CallableWrapperBase {
+ public:
+ explicit CallableWrapper(CallableType&& callable)
+ : m_callable(WTFMove(callable))
+ {
+ }
+
+ CallableWrapper(const CallableWrapper&) = delete;
+ CallableWrapper& operator=(const CallableWrapper&) = delete;
+
+ void call() final { m_callable(); }
+
+ private:
+ CallableType m_callable;
+ };
+
+ std::unique_ptr<CallableWrapperBase> m_callableWrapper;
+};
+
</ins><span class="cx"> // FunctionDispatcher is an abstract representation of something that functions can be
</span><span class="cx"> // dispatched to. This can for example be a run loop or a work queue.
</span><span class="cx">
</span><span class="lines">@@ -38,7 +94,7 @@
</span><span class="cx"> public:
</span><span class="cx"> WTF_EXPORT_PRIVATE virtual ~FunctionDispatcher();
</span><span class="cx">
</span><del>- virtual void dispatch(std::function<void ()>) = 0;
</del><ins>+ virtual void dispatch(NoncopyableFunction&&) = 0;
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> WTF_EXPORT_PRIVATE FunctionDispatcher();
</span><span class="lines">@@ -47,5 +103,6 @@
</span><span class="cx"> } // namespace WTF
</span><span class="cx">
</span><span class="cx"> using WTF::FunctionDispatcher;
</span><ins>+using WTF::NoncopyableFunction;
</ins><span class="cx">
</span><span class="cx"> #endif // FunctionDispatcher_h
</span></span></pre></div>
<a id="trunkSourceWTFwtfRunLoopcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/RunLoop.cpp (201463 => 201464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/RunLoop.cpp 2016-05-27 20:14:16 UTC (rev 201463)
+++ trunk/Source/WTF/wtf/RunLoop.cpp 2016-05-27 20:22:12 UTC (rev 201464)
</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>- std::function<void()> function;
</del><ins>+ NoncopyableFunction 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>- std::function<void()> function;
</del><ins>+ NoncopyableFunction 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(std::function<void ()> function)
</del><ins>+void RunLoop::dispatch(NoncopyableFunction&& 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 (201463 => 201464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/RunLoop.h 2016-05-27 20:14:16 UTC (rev 201463)
+++ trunk/Source/WTF/wtf/RunLoop.h 2016-05-27 20:22:12 UTC (rev 201464)
</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(std::function<void()>) override;
</del><ins>+ void dispatch(NoncopyableFunction&&) 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, std::function<void()>);
</del><ins>+ WTF_EXPORT_PRIVATE void dispatchAfter(std::chrono::nanoseconds, NoncopyableFunction&&);
</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<std::function<void ()>> m_functionQueue;
</del><ins>+ Deque<NoncopyableFunction> 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 (201463 => 201464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/WorkQueue.h 2016-05-27 20:14:16 UTC (rev 201463)
+++ trunk/Source/WTF/wtf/WorkQueue.h 2016-05-27 20:22:12 UTC (rev 201464)
</span><span class="lines">@@ -68,12 +68,12 @@
</span><span class="cx"> Utility,
</span><span class="cx"> Background
</span><span class="cx"> };
</span><del>-
</del><ins>+
</ins><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(std::function<void ()>) override;
- WTF_EXPORT_PRIVATE void dispatchAfter(std::chrono::nanoseconds, std::function<void ()>);
</del><ins>+ WTF_EXPORT_PRIVATE void dispatch(NoncopyableFunction&&) override;
+ WTF_EXPORT_PRIVATE void dispatchAfter(std::chrono::nanoseconds, NoncopyableFunction&&);
</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 (201463 => 201464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/cocoa/WorkQueueCocoa.cpp 2016-05-27 20:14:16 UTC (rev 201463)
+++ trunk/Source/WTF/wtf/cocoa/WorkQueueCocoa.cpp 2016-05-27 20:22:12 UTC (rev 201464)
</span><span class="lines">@@ -28,20 +28,24 @@
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span><del>-void WorkQueue::dispatch(std::function<void ()> function)
</del><ins>+void WorkQueue::dispatch(NoncopyableFunction&& function)
</ins><span class="cx"> {
</span><span class="cx"> ref();
</span><ins>+ auto* functionPtr = new NoncopyableFunction(WTFMove(function));
</ins><span class="cx"> dispatch_async(m_dispatchQueue, ^{
</span><del>- function();
</del><ins>+ (*functionPtr)();
+ delete functionPtr;
</ins><span class="cx"> deref();
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkQueue::dispatchAfter(std::chrono::nanoseconds duration, std::function<void ()> function)
</del><ins>+void WorkQueue::dispatchAfter(std::chrono::nanoseconds duration, NoncopyableFunction&& function)
</ins><span class="cx"> {
</span><span class="cx"> ref();
</span><ins>+ auto* functionPtr = new NoncopyableFunction(WTFMove(function));
</ins><span class="cx"> dispatch_after(dispatch_time(DISPATCH_TIME_NOW, duration.count()), m_dispatchQueue, ^{
</span><del>- function();
</del><ins>+ (*functionPtr)();
+ delete functionPtr;
</ins><span class="cx"> deref();
</span><span class="cx"> });
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWTFwtfeflDispatchQueueWorkItemEflh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/efl/DispatchQueueWorkItemEfl.h (201463 => 201464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/efl/DispatchQueueWorkItemEfl.h 2016-05-27 20:14:16 UTC (rev 201463)
+++ trunk/Source/WTF/wtf/efl/DispatchQueueWorkItemEfl.h 2016-05-27 20:22:12 UTC (rev 201464)
</span><span class="lines">@@ -28,13 +28,14 @@
</span><span class="cx">
</span><span class="cx"> #include <wtf/Assertions.h>
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span><ins>+#include <wtf/FunctionDispatcher.h>
</ins><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/WorkQueue.h>
</span><span class="cx">
</span><span class="cx"> class WorkItem {
</span><span class="cx"> public:
</span><del>- WorkItem(PassRefPtr<WorkQueue> workQueue, std::function<void ()> function)
- : m_workQueue(workQueue)
</del><ins>+ WorkItem(Ref<WorkQueue>&& workQueue, NoncopyableFunction&& function)
+ : m_workQueue(WTFMove(workQueue))
</ins><span class="cx"> , m_function(WTFMove(function))
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -42,23 +43,23 @@
</span><span class="cx"> void dispatch() { m_function(); }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- RefPtr<WorkQueue> m_workQueue;
- std::function<void ()> m_function;
</del><ins>+ Ref<WorkQueue> m_workQueue;
+ NoncopyableFunction 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(PassRefPtr<WorkQueue> workQueue, std::function<void ()> function, std::chrono::nanoseconds delayNanoSeconds)
</del><ins>+ static std::unique_ptr<TimerWorkItem> create(Ref<WorkQueue>&& workQueue, NoncopyableFunction&& function, std::chrono::nanoseconds delayNanoSeconds)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(delayNanoSeconds.count() >= 0);
</span><del>- return std::unique_ptr<TimerWorkItem>(new TimerWorkItem(workQueue, WTFMove(function), monotonicallyIncreasingTime() * 1000000000.0 + delayNanoSeconds.count()));
</del><ins>+ return std::unique_ptr<TimerWorkItem>(new TimerWorkItem(WTFMove(workQueue), WTFMove(function), monotonicallyIncreasingTime() * 1000000000.0 + delayNanoSeconds.count()));
</ins><span class="cx"> }
</span><span class="cx"> double expirationTimeNanoSeconds() const { return m_expirationTimeNanoSeconds; }
</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(PassRefPtr<WorkQueue> workQueue, std::function<void ()> function, double expirationTimeNanoSeconds)
- : WorkItem(workQueue, WTFMove(function))
</del><ins>+ TimerWorkItem(Ref<WorkQueue>&& workQueue, NoncopyableFunction&& function, double expirationTimeNanoSeconds)
+ : WorkItem(WTFMove(workQueue), WTFMove(function))
</ins><span class="cx"> , m_expirationTimeNanoSeconds(expirationTimeNanoSeconds)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWTFwtfeflWorkQueueEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/efl/WorkQueueEfl.cpp (201463 => 201464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/efl/WorkQueueEfl.cpp 2016-05-27 20:14:16 UTC (rev 201463)
+++ trunk/Source/WTF/wtf/efl/WorkQueueEfl.cpp 2016-05-27 20:22:12 UTC (rev 201464)
</span><span class="lines">@@ -54,20 +54,20 @@
</span><span class="cx"> m_dispatchQueue->clearSocketEventHandler();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkQueue::dispatch(std::function<void ()> function)
</del><ins>+void WorkQueue::dispatch(NoncopyableFunction&& function)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_dispatchQueue)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_dispatchQueue->dispatch(std::make_unique<WorkItem>(this, WTFMove(function)));
</del><ins>+ m_dispatchQueue->dispatch(std::make_unique<WorkItem>(*this, WTFMove(function)));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkQueue::dispatchAfter(std::chrono::nanoseconds duration, std::function<void ()> function)
</del><ins>+void WorkQueue::dispatchAfter(std::chrono::nanoseconds duration, NoncopyableFunction&& function)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_dispatchQueue)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_dispatchQueue->dispatch(TimerWorkItem::create(this, WTFMove(function), duration));
</del><ins>+ m_dispatchQueue->dispatch(TimerWorkItem::create(*this, WTFMove(function), duration));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWTFwtfgenericRunLoopGenericcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/generic/RunLoopGeneric.cpp (201463 => 201464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/generic/RunLoopGeneric.cpp 2016-05-27 20:14:16 UTC (rev 201463)
+++ trunk/Source/WTF/wtf/generic/RunLoopGeneric.cpp 2016-05-27 20:22:12 UTC (rev 201464)
</span><span class="lines">@@ -239,11 +239,11 @@
</span><span class="cx"> wakeUp(locker);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RunLoop::dispatchAfter(std::chrono::nanoseconds delay, std::function<void()> function)
</del><ins>+void RunLoop::dispatchAfter(std::chrono::nanoseconds delay, NoncopyableFunction&& function)
</ins><span class="cx"> {
</span><span class="cx"> LockHolder locker(m_loopLock);
</span><span class="cx"> bool repeating = false;
</span><del>- schedule(locker, TimerBase::ScheduledTask::create(function, delay.count() / 1000.0 / 1000.0 / 1000.0, repeating));
</del><ins>+ schedule(locker, TimerBase::ScheduledTask::create(WTFMove(function), delay.count() / 1000.0 / 1000.0 / 1000.0, repeating));
</ins><span class="cx"> wakeUp(locker);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfgenericWorkQueueGenericcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/generic/WorkQueueGeneric.cpp (201463 => 201464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/generic/WorkQueueGeneric.cpp 2016-05-27 20:14:16 UTC (rev 201463)
+++ trunk/Source/WTF/wtf/generic/WorkQueueGeneric.cpp 2016-05-27 20:22:12 UTC (rev 201464)
</span><span class="lines">@@ -81,18 +81,18 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkQueue::dispatch(std::function<void()> function)
</del><ins>+void WorkQueue::dispatch(NoncopyableFunction&& function)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<WorkQueue> protect(this);
</span><del>- m_runLoop->dispatch([protect, function] {
</del><ins>+ m_runLoop->dispatch([protect, function = WTFMove(function)] {
</ins><span class="cx"> function();
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkQueue::dispatchAfter(std::chrono::nanoseconds delay, std::function<void()> function)
</del><ins>+void WorkQueue::dispatchAfter(std::chrono::nanoseconds delay, NoncopyableFunction&& function)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<WorkQueue> protect(this);
</span><del>- m_runLoop->dispatchAfter(delay, [protect, function] {
</del><ins>+ m_runLoop->dispatchAfter(delay, [protect, function = WTFMove(function)] {
</ins><span class="cx"> function();
</span><span class="cx"> });
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWTFwtfglibRunLoopGLibcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/glib/RunLoopGLib.cpp (201463 => 201464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/glib/RunLoopGLib.cpp 2016-05-27 20:14:16 UTC (rev 201463)
+++ trunk/Source/WTF/wtf/glib/RunLoopGLib.cpp 2016-05-27 20:22:12 UTC (rev 201464)
</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(std::function<void()>&& function)
</del><ins>+ DispatchAfterContext(NoncopyableFunction&& 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>- std::function<void()> m_function;
</del><ins>+ NoncopyableFunction m_function;
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-void RunLoop::dispatchAfter(std::chrono::nanoseconds duration, std::function<void()> function)
</del><ins>+void RunLoop::dispatchAfter(std::chrono::nanoseconds duration, NoncopyableFunction&& 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 (201463 => 201464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/win/WorkItemWin.cpp 2016-05-27 20:14:16 UTC (rev 201463)
+++ trunk/Source/WTF/wtf/win/WorkItemWin.cpp 2016-05-27 20:22:12 UTC (rev 201464)
</span><span class="lines">@@ -32,32 +32,32 @@
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span><del>-WorkItemWin::WorkItemWin(std::function<void()> function, WorkQueue* queue)
- : m_function(function)
</del><ins>+WorkItemWin::WorkItemWin(NoncopyableFunction&& function, WorkQueue* queue)
+ : m_function(WTFMove(function))
</ins><span class="cx"> , m_queue(queue)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<WorkItemWin> WorkItemWin::create(std::function<void()> function, WorkQueue* queue)
</del><ins>+RefPtr<WorkItemWin> WorkItemWin::create(NoncopyableFunction&& function, WorkQueue* queue)
</ins><span class="cx"> {
</span><del>- return adoptRef(new WorkItemWin(function, queue));
</del><ins>+ return adoptRef(new WorkItemWin(WTFMove(function), queue));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WorkItemWin::~WorkItemWin()
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HandleWorkItem::HandleWorkItem(HANDLE handle, const std::function<void()>& function, WorkQueue* queue)
- : WorkItemWin(function, queue)
</del><ins>+HandleWorkItem::HandleWorkItem(HANDLE handle, NoncopyableFunction&& function, WorkQueue* queue)
+ : WorkItemWin(WTFMove(function), queue)
</ins><span class="cx"> , m_handle(handle)
</span><span class="cx"> , m_waitHandle(0)
</span><span class="cx"> {
</span><span class="cx"> ASSERT_ARG(handle, handle);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<HandleWorkItem> HandleWorkItem::createByAdoptingHandle(HANDLE handle, const std::function<void()>& function, WorkQueue* queue)
</del><ins>+RefPtr<HandleWorkItem> HandleWorkItem::createByAdoptingHandle(HANDLE handle, NoncopyableFunction&& function, WorkQueue* queue)
</ins><span class="cx"> {
</span><del>- return adoptRef(new HandleWorkItem(handle, function, queue));
</del><ins>+ return adoptRef(new HandleWorkItem(handle, WTFMove(function), queue));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HandleWorkItem::~HandleWorkItem()
</span></span></pre></div>
<a id="trunkSourceWTFwtfwinWorkItemWinh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/win/WorkItemWin.h (201463 => 201464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/win/WorkItemWin.h 2016-05-27 20:14:16 UTC (rev 201463)
+++ trunk/Source/WTF/wtf/win/WorkItemWin.h 2016-05-27 20:22:12 UTC (rev 201464)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx">
</span><span class="cx"> #include <Windows.h>
</span><span class="cx"> #include <functional>
</span><ins>+#include <wtf/FunctionDispatcher.h>
</ins><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/ThreadSafeRefCounted.h>
</span><span class="cx">
</span><span class="lines">@@ -38,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(std::function<void()>, WorkQueue*);
</del><ins>+ static RefPtr<WorkItemWin> create(NoncopyableFunction&&, WorkQueue*);
</ins><span class="cx"> virtual ~WorkItemWin();
</span><span class="cx">
</span><del>- std::function<void()>& function() { return m_function; }
</del><ins>+ NoncopyableFunction& 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(std::function<void()>, WorkQueue*);
</del><ins>+ WorkItemWin(NoncopyableFunction&&, WorkQueue*);
</ins><span class="cx">
</span><span class="cx"> private:
</span><del>- std::function<void()> m_function;
</del><ins>+ NoncopyableFunction 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, const std::function<void()>&, WorkQueue*);
</del><ins>+ static RefPtr<HandleWorkItem> createByAdoptingHandle(HANDLE, NoncopyableFunction&&, 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, const std::function<void()>&, WorkQueue*);
</del><ins>+ HandleWorkItem(HANDLE, NoncopyableFunction&&, 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 (201463 => 201464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/win/WorkQueueWin.cpp 2016-05-27 20:14:16 UTC (rev 201463)
+++ trunk/Source/WTF/wtf/win/WorkQueueWin.cpp 2016-05-27 20:22:12 UTC (rev 201464)
</span><span class="lines">@@ -129,11 +129,11 @@
</span><span class="cx"> ::DeleteTimerQueueEx(m_timerQueue, 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkQueue::dispatch(std::function<void()> function)
</del><ins>+void WorkQueue::dispatch(NoncopyableFunction&& function)
</ins><span class="cx"> {
</span><span class="cx"> MutexLocker locker(m_workItemQueueLock);
</span><span class="cx"> ref();
</span><del>- m_workItemQueue.append(WorkItemWin::create(function, this));
</del><ins>+ m_workItemQueue.append(WorkItemWin::create(WTFMove(function), this));
</ins><span class="cx">
</span><span class="cx"> // Spawn a work thread to perform the work we just added. As an optimization, we avoid
</span><span class="cx"> // spawning the thread if a work thread is already registered. This prevents multiple work
</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>- std::function<void()> function;
</del><ins>+ NoncopyableFunction function;
</ins><span class="cx"> Mutex timerMutex;
</span><span class="cx"> HANDLE timer;
</span><span class="cx">
</span><span class="lines">@@ -169,7 +169,7 @@
</span><span class="cx"> // Balanced by leakRef in scheduleWorkAfterDelay.
</span><span class="cx"> RefPtr<TimerContext> timerContext = adoptRef(static_cast<TimerContext*>(context));
</span><span class="cx">
</span><del>- timerContext->queue->dispatch(timerContext->function);
</del><ins>+ timerContext->queue->dispatch(WTFMove(timerContext->function));
</ins><span class="cx">
</span><span class="cx"> MutexLocker lock(timerContext->timerMutex);
</span><span class="cx"> ASSERT(timerContext->timer);
</span><span class="lines">@@ -180,14 +180,14 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkQueue::dispatchAfter(std::chrono::nanoseconds duration, std::function<void()> function)
</del><ins>+void WorkQueue::dispatchAfter(std::chrono::nanoseconds duration, NoncopyableFunction&& function)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_timerQueue);
</span><span class="cx"> ref();
</span><span class="cx">
</span><span class="cx"> RefPtr<TimerContext> context = TimerContext::create();
</span><span class="cx"> context->queue = this;
</span><del>- context->function = function;
</del><ins>+ context->function = WTFMove(function);
</ins><span class="cx">
</span><span class="cx"> {
</span><span class="cx"> // The timer callback could fire before ::CreateTimerQueueTimer even returns, so we protect
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (201463 => 201464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-05-27 20:14:16 UTC (rev 201463)
+++ trunk/Source/WebKit2/ChangeLog 2016-05-27 20:22:12 UTC (rev 201464)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2016-05-27 Chris Dumez <cdumez@apple.com>
+
+ WorkQueue::dispatch() / RunLoop::dispatch() should not copy captured lambda variables
+ https://bugs.webkit.org/show_bug.cgi?id=158111
+
+ Reviewed by Darin Adler.
+
+ WorkQueue::dispatch() / RunLoop::dispatch() should not copy captured lambda variables.
+ These are often used cross-thread and copying the captured lambda variables can be
+ dangerous (e.g. we do not want to copy a String after calling isolatedCopy() upon
+ capture).
+
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::clearDiskCacheEntries):
+ * NetworkProcess/cache/NetworkCache.cpp:
+ (WebKit::NetworkCache::Cache::clear):
+ * NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp:
+ (WebKit::NetworkCache::runTaskInQueue):
+ * Platform/IPC/Connection.cpp:
+ (IPC::Connection::processIncomingMessage):
+ * UIProcess/Storage/StorageManager.cpp:
+ (WebKit::StorageManager::getSessionStorageOrigins):
+ (WebKit::StorageManager::deleteSessionStorageOrigins):
+ (WebKit::StorageManager::deleteSessionStorageEntriesForOrigins):
+ (WebKit::StorageManager::getLocalStorageOrigins):
+ (WebKit::StorageManager::getLocalStorageOriginDetails):
+ (WebKit::StorageManager::deleteLocalStorageOriginsModifiedSince):
+ (WebKit::StorageManager::deleteLocalStorageEntriesForOrigins):
+ * UIProcess/Storage/StorageManager.h:
+
</ins><span class="cx"> 2016-05-27 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Expose content extension failure error codes in SPI
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (201463 => 201464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2016-05-27 20:14:16 UTC (rev 201463)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2016-05-27 20:22:12 UTC (rev 201464)
</span><span class="lines">@@ -421,7 +421,7 @@
</span><span class="cx"> completionHandler();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void clearDiskCacheEntries(const Vector<SecurityOriginData>& origins, std::function<void ()> completionHandler)
</del><ins>+static void clearDiskCacheEntries(const Vector<SecurityOriginData>& origins, std::function<void ()>&& completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETWORK_CACHE)
</span><span class="cx"> if (NetworkCache::singleton().isEnabled()) {
</span><span class="lines">@@ -432,7 +432,7 @@
</span><span class="cx">
</span><span class="cx"> auto* cacheKeysToDelete = new Vector<NetworkCache::Key>;
</span><span class="cx">
</span><del>- NetworkCache::singleton().traverse([completionHandler, originsToDelete, cacheKeysToDelete](auto* traversalEntry) {
</del><ins>+ NetworkCache::singleton().traverse([completionHandler = WTFMove(completionHandler), originsToDelete, cacheKeysToDelete](auto* traversalEntry) mutable {
</ins><span class="cx"> if (traversalEntry) {
</span><span class="cx"> if (originsToDelete->contains(SecurityOrigin::create(traversalEntry->entry.response().url())))
</span><span class="cx"> cacheKeysToDelete->append(traversalEntry->entry.key());
</span><span class="lines">@@ -446,7 +446,7 @@
</span><span class="cx">
</span><span class="cx"> delete cacheKeysToDelete;
</span><span class="cx">
</span><del>- RunLoop::main().dispatch(completionHandler);
</del><ins>+ RunLoop::main().dispatch(WTFMove(completionHandler));
</ins><span class="cx"> return;
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp (201463 => 201464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2016-05-27 20:14:16 UTC (rev 201463)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2016-05-27 20:22:12 UTC (rev 201464)
</span><span class="lines">@@ -632,7 +632,7 @@
</span><span class="cx"> m_statistics->clear();
</span><span class="cx">
</span><span class="cx"> if (!m_storage) {
</span><del>- RunLoop::main().dispatch(completionHandler);
</del><ins>+ RunLoop::main().dispatch(WTFMove(completionHandler));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> String anyType;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheIOChannelSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp (201463 => 201464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp 2016-05-27 20:14:16 UTC (rev 201463)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp 2016-05-27 20:22:12 UTC (rev 201464)
</span><span class="lines">@@ -69,10 +69,10 @@
</span><span class="cx"> return adoptRef(*new IOChannel(filePath, type));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline void runTaskInQueue(std::function<void ()> task, WorkQueue* queue)
</del><ins>+static inline void runTaskInQueue(NoncopyableFunction&& task, WorkQueue* queue)
</ins><span class="cx"> {
</span><span class="cx"> if (queue) {
</span><del>- queue->dispatch(task);
</del><ins>+ queue->dispatch(WTFMove(task));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/Connection.cpp (201463 => 201464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/Connection.cpp 2016-05-27 20:14:16 UTC (rev 201463)
+++ trunk/Source/WebKit2/Platform/IPC/Connection.cpp 2016-05-27 20:22:12 UTC (rev 201464)
</span><span class="lines">@@ -681,7 +681,7 @@
</span><span class="cx"> std::lock_guard<Lock> lock(m_incomingSyncMessageCallbackMutex);
</span><span class="cx">
</span><span class="cx"> for (auto& callback : m_incomingSyncMessageCallbacks.values())
</span><del>- m_incomingSyncMessageCallbackQueue->dispatch(callback);
</del><ins>+ m_incomingSyncMessageCallbackQueue->dispatch(WTFMove(callback));
</ins><span class="cx">
</span><span class="cx"> m_incomingSyncMessageCallbacks.clear();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageStorageManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp (201463 => 201464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2016-05-27 20:14:16 UTC (rev 201463)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2016-05-27 20:22:12 UTC (rev 201464)
</span><span class="lines">@@ -553,11 +553,11 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StorageManager::getSessionStorageOrigins(std::function<void (HashSet<RefPtr<WebCore::SecurityOrigin>>&&)> completionHandler)
</del><ins>+void StorageManager::getSessionStorageOrigins(std::function<void (HashSet<RefPtr<WebCore::SecurityOrigin>>&&)>&& completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<StorageManager> storageManager(this);
</span><span class="cx">
</span><del>- m_queue->dispatch([storageManager, completionHandler] {
</del><ins>+ m_queue->dispatch([storageManager, completionHandler = WTFMove(completionHandler)]() mutable {
</ins><span class="cx"> HashSet<RefPtr<SecurityOrigin>> origins;
</span><span class="cx">
</span><span class="cx"> for (const auto& sessionStorageNamespace : storageManager->m_sessionStorageNamespaces.values()) {
</span><span class="lines">@@ -565,25 +565,25 @@
</span><span class="cx"> origins.add(WTFMove(origin));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RunLoop::main().dispatch([origins, completionHandler]() mutable {
</del><ins>+ RunLoop::main().dispatch([origins, completionHandler = WTFMove(completionHandler)]() mutable {
</ins><span class="cx"> completionHandler(WTFMove(origins));
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StorageManager::deleteSessionStorageOrigins(std::function<void ()> completionHandler)
</del><ins>+void StorageManager::deleteSessionStorageOrigins(std::function<void ()>&& completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<StorageManager> storageManager(this);
</span><span class="cx">
</span><del>- m_queue->dispatch([storageManager, completionHandler] {
</del><ins>+ m_queue->dispatch([storageManager, completionHandler = WTFMove(completionHandler)]() mutable {
</ins><span class="cx"> for (auto& sessionStorageNamespace : storageManager->m_sessionStorageNamespaces.values())
</span><span class="cx"> sessionStorageNamespace->clearAllStorageAreas();
</span><span class="cx">
</span><del>- RunLoop::main().dispatch(completionHandler);
</del><ins>+ RunLoop::main().dispatch(WTFMove(completionHandler));
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StorageManager::deleteSessionStorageEntriesForOrigins(const Vector<RefPtr<WebCore::SecurityOrigin>>& origins, std::function<void ()> completionHandler)
</del><ins>+void StorageManager::deleteSessionStorageEntriesForOrigins(const Vector<RefPtr<WebCore::SecurityOrigin>>& origins, std::function<void ()>&& completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> Vector<RefPtr<WebCore::SecurityOrigin>> copiedOrigins;
</span><span class="cx"> copiedOrigins.reserveInitialCapacity(origins.size());
</span><span class="lines">@@ -592,21 +592,21 @@
</span><span class="cx"> copiedOrigins.uncheckedAppend(origin->isolatedCopy());
</span><span class="cx">
</span><span class="cx"> RefPtr<StorageManager> storageManager(this);
</span><del>- m_queue->dispatch([storageManager, copiedOrigins, completionHandler] {
</del><ins>+ m_queue->dispatch([storageManager, copiedOrigins, completionHandler = WTFMove(completionHandler)]() mutable {
</ins><span class="cx"> for (auto& origin : copiedOrigins) {
</span><span class="cx"> for (auto& sessionStorageNamespace : storageManager->m_sessionStorageNamespaces.values())
</span><span class="cx"> sessionStorageNamespace->clearStorageAreasMatchingOrigin(*origin);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RunLoop::main().dispatch(completionHandler);
</del><ins>+ RunLoop::main().dispatch(WTFMove(completionHandler));
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StorageManager::getLocalStorageOrigins(std::function<void (HashSet<RefPtr<WebCore::SecurityOrigin>>&&)> completionHandler)
</del><ins>+void StorageManager::getLocalStorageOrigins(std::function<void (HashSet<RefPtr<WebCore::SecurityOrigin>>&&)>&& completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<StorageManager> storageManager(this);
</span><span class="cx">
</span><del>- m_queue->dispatch([storageManager, completionHandler] {
</del><ins>+ m_queue->dispatch([storageManager, completionHandler = WTFMove(completionHandler)]() mutable {
</ins><span class="cx"> HashSet<RefPtr<SecurityOrigin>> origins;
</span><span class="cx">
</span><span class="cx"> for (auto& origin : storageManager->m_localStorageDatabaseTracker->origins())
</span><span class="lines">@@ -617,20 +617,20 @@
</span><span class="cx"> origins.add(WTFMove(origin));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RunLoop::main().dispatch([origins, completionHandler]() mutable {
</del><ins>+ RunLoop::main().dispatch([origins, completionHandler = WTFMove(completionHandler)]() mutable {
</ins><span class="cx"> completionHandler(WTFMove(origins));
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StorageManager::getLocalStorageOriginDetails(std::function<void (Vector<LocalStorageDatabaseTracker::OriginDetails>)> completionHandler)
</del><ins>+void StorageManager::getLocalStorageOriginDetails(std::function<void (Vector<LocalStorageDatabaseTracker::OriginDetails>)>&& completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<StorageManager> storageManager(this);
</span><span class="cx">
</span><del>- m_queue->dispatch([storageManager, completionHandler] {
</del><ins>+ m_queue->dispatch([storageManager, completionHandler = WTFMove(completionHandler)]() mutable {
</ins><span class="cx"> auto originDetails = storageManager->m_localStorageDatabaseTracker->originDetails();
</span><span class="cx">
</span><del>- RunLoop::main().dispatch([originDetails, completionHandler]() mutable {
</del><ins>+ RunLoop::main().dispatch([originDetails, completionHandler = WTFMove(completionHandler)]() mutable {
</ins><span class="cx"> completionHandler(WTFMove(originDetails));
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="lines">@@ -652,11 +652,11 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StorageManager::deleteLocalStorageOriginsModifiedSince(std::chrono::system_clock::time_point time, std::function<void ()> completionHandler)
</del><ins>+void StorageManager::deleteLocalStorageOriginsModifiedSince(std::chrono::system_clock::time_point time, std::function<void ()>&& completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<StorageManager> storageManager(this);
</span><span class="cx">
</span><del>- m_queue->dispatch([storageManager, time, completionHandler] {
</del><ins>+ m_queue->dispatch([storageManager, time, completionHandler = WTFMove(completionHandler)]() mutable {
</ins><span class="cx"> auto deletedOrigins = storageManager->m_localStorageDatabaseTracker->deleteDatabasesModifiedSince(time);
</span><span class="cx">
</span><span class="cx"> for (const auto& origin : deletedOrigins) {
</span><span class="lines">@@ -667,11 +667,11 @@
</span><span class="cx"> for (auto& transientLocalStorageNamespace : storageManager->m_transientLocalStorageNamespaces.values())
</span><span class="cx"> transientLocalStorageNamespace->clearAllStorageAreas();
</span><span class="cx">
</span><del>- RunLoop::main().dispatch(completionHandler);
</del><ins>+ RunLoop::main().dispatch(WTFMove(completionHandler));
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StorageManager::deleteLocalStorageEntriesForOrigins(const Vector<RefPtr<WebCore::SecurityOrigin>>& origins, std::function<void ()> completionHandler)
</del><ins>+void StorageManager::deleteLocalStorageEntriesForOrigins(const Vector<RefPtr<WebCore::SecurityOrigin>>& origins, std::function<void ()>&& completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> Vector<RefPtr<WebCore::SecurityOrigin>> copiedOrigins;
</span><span class="cx"> copiedOrigins.reserveInitialCapacity(origins.size());
</span><span class="lines">@@ -680,7 +680,7 @@
</span><span class="cx"> copiedOrigins.uncheckedAppend(origin->isolatedCopy());
</span><span class="cx">
</span><span class="cx"> RefPtr<StorageManager> storageManager(this);
</span><del>- m_queue->dispatch([storageManager, copiedOrigins, completionHandler] {
</del><ins>+ m_queue->dispatch([storageManager, copiedOrigins, completionHandler = WTFMove(completionHandler)]() mutable {
</ins><span class="cx"> for (auto& origin : copiedOrigins) {
</span><span class="cx"> for (auto& localStorageNamespace : storageManager->m_localStorageNamespaces.values())
</span><span class="cx"> localStorageNamespace->clearStorageAreasMatchingOrigin(*origin);
</span><span class="lines">@@ -691,7 +691,7 @@
</span><span class="cx"> storageManager->m_localStorageDatabaseTracker->deleteDatabaseWithOrigin(origin.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RunLoop::main().dispatch(completionHandler);
</del><ins>+ RunLoop::main().dispatch(WTFMove(completionHandler));
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageStorageManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h (201463 => 201464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h 2016-05-27 20:14:16 UTC (rev 201463)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h 2016-05-27 20:22:12 UTC (rev 201464)
</span><span class="lines">@@ -59,17 +59,17 @@
</span><span class="cx"> void processDidCloseConnection(WebProcessProxy&, IPC::Connection&);
</span><span class="cx"> void applicationWillTerminate();
</span><span class="cx">
</span><del>- void getSessionStorageOrigins(std::function<void (HashSet<RefPtr<WebCore::SecurityOrigin>>&&)> completionHandler);
- void deleteSessionStorageOrigins(std::function<void ()> completionHandler);
- void deleteSessionStorageEntriesForOrigins(const Vector<RefPtr<WebCore::SecurityOrigin>>&, std::function<void ()> completionHandler);
</del><ins>+ void getSessionStorageOrigins(std::function<void (HashSet<RefPtr<WebCore::SecurityOrigin>>&&)>&& completionHandler);
+ void deleteSessionStorageOrigins(std::function<void ()>&& completionHandler);
+ void deleteSessionStorageEntriesForOrigins(const Vector<RefPtr<WebCore::SecurityOrigin>>&, std::function<void ()>&& completionHandler);
</ins><span class="cx">
</span><del>- void getLocalStorageOrigins(std::function<void (HashSet<RefPtr<WebCore::SecurityOrigin>>&&)> completionHandler);
</del><ins>+ void getLocalStorageOrigins(std::function<void (HashSet<RefPtr<WebCore::SecurityOrigin>>&&)>&& completionHandler);
</ins><span class="cx"> void deleteLocalStorageEntriesForOrigin(const WebCore::SecurityOrigin&);
</span><span class="cx">
</span><del>- void deleteLocalStorageOriginsModifiedSince(std::chrono::system_clock::time_point, std::function<void ()> completionHandler);
- void deleteLocalStorageEntriesForOrigins(const Vector<RefPtr<WebCore::SecurityOrigin>>&, std::function<void ()> completionHandler);
</del><ins>+ void deleteLocalStorageOriginsModifiedSince(std::chrono::system_clock::time_point, std::function<void ()>&& completionHandler);
+ void deleteLocalStorageEntriesForOrigins(const Vector<RefPtr<WebCore::SecurityOrigin>>&, std::function<void ()>&& completionHandler);
</ins><span class="cx">
</span><del>- void getLocalStorageOriginDetails(std::function<void (Vector<LocalStorageDatabaseTracker::OriginDetails>)> completionHandler);
</del><ins>+ void getLocalStorageOriginDetails(std::function<void (Vector<LocalStorageDatabaseTracker::OriginDetails>)>&& completionHandler);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> explicit StorageManager(const String& localStorageDirectory);
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (201463 => 201464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-05-27 20:14:16 UTC (rev 201463)
+++ trunk/Tools/ChangeLog 2016-05-27 20:22:12 UTC (rev 201464)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-05-27 Chris Dumez <cdumez@apple.com>
+
+ WorkQueue::dispatch() / RunLoop::dispatch() should not copy captured lambda variables
+ https://bugs.webkit.org/show_bug.cgi?id=158111
+
+ Reviewed by Darin Adler.
+
+ WorkQueue::dispatch() / RunLoop::dispatch() should not copy captured lambda variables.
+ These are often used cross-thread and copying the captured lambda variables can be
+ dangerous (e.g. we do not want to copy a String after calling isolatedCopy() upon
+ capture).
+
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::decidePolicyForNavigationAction):
+
</ins><span class="cx"> 2016-05-27 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Modern IDB: After closing a Netflix video, trying to watch it again fails.
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (201463 => 201464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.cpp 2016-05-27 20:14:16 UTC (rev 201463)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2016-05-27 20:22:12 UTC (rev 201464)
</span><span class="lines">@@ -2022,7 +2022,7 @@
</span><span class="cx"> {
</span><span class="cx"> WKRetainPtr<WKFramePolicyListenerRef> retainedListener { listener };
</span><span class="cx"> const bool shouldIgnore { m_policyDelegateEnabled && !m_policyDelegatePermissive };
</span><del>- std::function<void()> decisionFunction = [shouldIgnore, retainedListener]() {
</del><ins>+ auto decisionFunction = [shouldIgnore, retainedListener]() {
</ins><span class="cx"> if (shouldIgnore)
</span><span class="cx"> WKFramePolicyListenerIgnore(retainedListener.get());
</span><span class="cx"> else
</span><span class="lines">@@ -2030,7 +2030,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> if (m_shouldDecideNavigationPolicyAfterDelay)
</span><del>- RunLoop::main().dispatch(decisionFunction);
</del><ins>+ RunLoop::main().dispatch(WTFMove(decisionFunction));
</ins><span class="cx"> else
</span><span class="cx"> decisionFunction();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>