<!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>[202439] 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/202439">202439</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-06-24 12:40:19 -0700 (Fri, 24 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename NoncopyableFunction to Function
https://bugs.webkit.org/show_bug.cgi?id=158354
Reviewed by Chris Dumez.
Source/WebCore:
* Modules/mediastream/MediaEndpointPeerConnection.cpp:
(WebCore::MediaEndpointPeerConnection::runTask):
* Modules/mediastream/MediaEndpointPeerConnection.h:
* Modules/webaudio/AudioDestinationNode.h:
(WebCore::AudioDestinationNode::resume):
(WebCore::AudioDestinationNode::suspend):
(WebCore::AudioDestinationNode::close):
* Modules/webaudio/DefaultAudioDestinationNode.cpp:
(WebCore::DefaultAudioDestinationNode::resume):
(WebCore::DefaultAudioDestinationNode::suspend):
(WebCore::DefaultAudioDestinationNode::close):
* Modules/webaudio/DefaultAudioDestinationNode.h:
* dom/ActiveDOMCallbackMicrotask.cpp:
(WebCore::ActiveDOMCallbackMicrotask::ActiveDOMCallbackMicrotask):
* dom/ActiveDOMCallbackMicrotask.h:
* dom/ScriptExecutionContext.h:
(WebCore::ScriptExecutionContext::Task::Task):
* fileapi/AsyncFileStream.cpp:
(WebCore::callOnFileThread):
(WebCore::AsyncFileStream::perform):
* fileapi/AsyncFileStream.h:
* page/FrameView.cpp:
(WebCore::FrameView::queuePostLayoutCallback):
(WebCore::FrameView::flushPostLayoutTasksQueue):
* page/FrameView.h:
* page/scrolling/ScrollingThread.cpp:
(WebCore::ScrollingThread::dispatch):
(WebCore::ScrollingThread::dispatchBarrier):
(WebCore::ScrollingThread::dispatchFunctionsFromScrollingThread):
* page/scrolling/ScrollingThread.h:
* platform/GenericTaskQueue.cpp:
(WebCore::TaskDispatcher<Timer>::postTask):
* platform/GenericTaskQueue.h:
(WebCore::TaskDispatcher::postTask):
* 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):
* style/StyleTreeResolver.cpp:
(WebCore::Style::postResolutionCallbackQueue):
(WebCore::Style::queuePostResolutionCallback):
* style/StyleTreeResolver.h:
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/NetworkProcess.cpp:
(WebKit::fetchDiskCacheEntries):
(WebKit::NetworkProcess::fetchWebsiteData):
(WebKit::clearDiskCacheEntries):
* NetworkProcess/NetworkProcess.h:
* NetworkProcess/cache/NetworkCache.cpp:
(WebKit::NetworkCache::Cache::traverse):
* NetworkProcess/cache/NetworkCache.h:
* NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp:
(WebKit::NetworkCache::runTaskInQueue):
* NetworkProcess/cache/NetworkCacheStorage.h:
Source/WTF:
* WTF.xcodeproj/project.pbxproj:
* wtf/CrossThreadTask.h:
(WTF::CrossThreadTask::CrossThreadTask):
* wtf/Function.h: Renamed from Source/WTF/wtf/NoncopyableFunction.h.
* wtf/FunctionDispatcher.h:
* wtf/MainThread.cpp:
(WTF::functionQueue):
(WTF::dispatchFunctionsFromMainThread):
(WTF::callOnMainThread):
* wtf/MainThread.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="#trunkSourceWTFWTFxcodeprojprojectpbxproj">trunk/Source/WTF/WTF.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWTFwtfCrossThreadTaskh">trunk/Source/WTF/wtf/CrossThreadTask.h</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="#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="#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="#trunkSourceWebCoreModuleswebaudioAudioDestinationNodeh">trunk/Source/WebCore/Modules/webaudio/AudioDestinationNode.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioDefaultAudioDestinationNodecpp">trunk/Source/WebCore/Modules/webaudio/DefaultAudioDestinationNode.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioDefaultAudioDestinationNodeh">trunk/Source/WebCore/Modules/webaudio/DefaultAudioDestinationNode.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsSerializedScriptValuecpp">trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsSerializedScriptValueh">trunk/Source/WebCore/bindings/js/SerializedScriptValue.h</a></li>
<li><a href="#trunkSourceWebCoredomActiveDOMCallbackMicrotaskcpp">trunk/Source/WebCore/dom/ActiveDOMCallbackMicrotask.cpp</a></li>
<li><a href="#trunkSourceWebCoredomActiveDOMCallbackMicrotaskh">trunk/Source/WebCore/dom/ActiveDOMCallbackMicrotask.h</a></li>
<li><a href="#trunkSourceWebCoredomScriptExecutionContexth">trunk/Source/WebCore/dom/ScriptExecutionContext.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="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewh">trunk/Source/WebCore/page/FrameView.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="#trunkSourceWebCoreplatformGenericTaskQueuecpp">trunk/Source/WebCore/platform/GenericTaskQueue.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformGenericTaskQueueh">trunk/Source/WebCore/platform/GenericTaskQueue.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="#trunkSourceWebCoreplatformnetworkBlobRegistryh">trunk/Source/WebCore/platform/network/BlobRegistry.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkBlobRegistryImplcpp">trunk/Source/WebCore/platform/network/BlobRegistryImpl.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkBlobRegistryImplh">trunk/Source/WebCore/platform/network/BlobRegistryImpl.h</a></li>
<li><a href="#trunkSourceWebCorestyleStyleTreeResolvercpp">trunk/Source/WebCore/style/StyleTreeResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorestyleStyleTreeResolverh">trunk/Source/WebCore/style/StyleTreeResolver.h</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="#trunkSourceWebKit2NetworkProcessFileAPINetworkBlobRegistrycpp">trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessFileAPINetworkBlobRegistryh">trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkDataTaskh">trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcesscpp">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcessh">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCachecpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheIOChannelSoupcpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheStorageh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessFileAPIBlobRegistryProxycpp">trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessFileAPIBlobRegistryProxyh">trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkNetworkProcessConnectioncpp">trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkNetworkProcessConnectionh">trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWTFwtfFunctionh">trunk/Source/WTF/wtf/Function.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWTFwtfNoncopyableFunctionh">trunk/Source/WTF/wtf/NoncopyableFunction.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WTF/ChangeLog 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -1,3 +1,56 @@
</span><ins>+2016-06-21 Anders Carlsson <andersca@apple.com>
+
+ Rename NoncopyableFunction to Function
+ https://bugs.webkit.org/show_bug.cgi?id=158354
+
+ Reviewed by Chris Dumez.
+
+ * WTF.xcodeproj/project.pbxproj:
+ * wtf/CrossThreadTask.h:
+ (WTF::CrossThreadTask::CrossThreadTask):
+ * wtf/Function.h: Renamed from Source/WTF/wtf/NoncopyableFunction.h.
+ * wtf/FunctionDispatcher.h:
+ * wtf/MainThread.cpp:
+ (WTF::functionQueue):
+ (WTF::dispatchFunctionsFromMainThread):
+ (WTF::callOnMainThread):
+ * wtf/MainThread.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-06-23 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r202380): iOS 9.x internal builds are broken
</span></span></pre></div>
<a id="trunkSourceWTFWTFxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.xcodeproj/project.pbxproj (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> 7E29C33E15FFD79B00516D61 /* ObjcRuntimeExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 7E29C33D15FFD79B00516D61 /* ObjcRuntimeExtras.h */; };
</span><span class="cx"> 8134013815B092FD001FF0B8 /* Base64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8134013615B092FD001FF0B8 /* Base64.cpp */; };
</span><span class="cx"> 8134013915B092FD001FF0B8 /* Base64.h in Headers */ = {isa = PBXBuildFile; fileRef = 8134013715B092FD001FF0B8 /* Base64.h */; };
</span><del>- 83F2BADF1CF9524E003E99C3 /* NoncopyableFunction.h in Headers */ = {isa = PBXBuildFile; fileRef = 83F2BADE1CF9524E003E99C3 /* NoncopyableFunction.h */; };
</del><ins>+ 83F2BADF1CF9524E003E99C3 /* Function.h in Headers */ = {isa = PBXBuildFile; fileRef = 83F2BADE1CF9524E003E99C3 /* Function.h */; };
</ins><span class="cx"> 83FBA93219DF459700F30ADB /* TypeCasts.h in Headers */ = {isa = PBXBuildFile; fileRef = 83FBA93119DF459700F30ADB /* TypeCasts.h */; };
</span><span class="cx"> 86F46F611A2840EE00CCBF22 /* RefCounter.h in Headers */ = {isa = PBXBuildFile; fileRef = 86F46F5F1A2840EE00CCBF22 /* RefCounter.h */; };
</span><span class="cx"> 93934BD318A1E8C300D0D6A1 /* StringViewObjC.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93934BD218A1E8C300D0D6A1 /* StringViewObjC.mm */; };
</span><span class="lines">@@ -449,7 +449,7 @@
</span><span class="cx"> 7E29C33D15FFD79B00516D61 /* ObjcRuntimeExtras.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjcRuntimeExtras.h; sourceTree = "<group>"; };
</span><span class="cx"> 8134013615B092FD001FF0B8 /* Base64.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Base64.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 8134013715B092FD001FF0B8 /* Base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Base64.h; sourceTree = "<group>"; };
</span><del>- 83F2BADE1CF9524E003E99C3 /* NoncopyableFunction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NoncopyableFunction.h; sourceTree = "<group>"; };
</del><ins>+ 83F2BADE1CF9524E003E99C3 /* Function.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Function.h; sourceTree = "<group>"; };
</ins><span class="cx"> 83FBA93119DF459700F30ADB /* TypeCasts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TypeCasts.h; sourceTree = "<group>"; };
</span><span class="cx"> 86F46F5F1A2840EE00CCBF22 /* RefCounter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RefCounter.h; sourceTree = "<group>"; };
</span><span class="cx"> 93934BD218A1E8C300D0D6A1 /* StringViewObjC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = StringViewObjC.mm; path = mac/StringViewObjC.mm; sourceTree = "<group>"; };
</span><span class="lines">@@ -843,6 +843,7 @@
</span><span class="cx"> 0F9D335C165DBA73005AD387 /* FilePrintStream.h */,
</span><span class="cx"> 0F2B66A517B6B4F700A7AE3F /* FlipBytes.h */,
</span><span class="cx"> A8A472A6151A825A004123FF /* Forward.h */,
</span><ins>+ 83F2BADE1CF9524E003E99C3 /* Function.h */,
</ins><span class="cx"> 1A1D8B9D1731879800141DA4 /* FunctionDispatcher.cpp */,
</span><span class="cx"> 1A1D8B9B173186CE00141DA4 /* FunctionDispatcher.h */,
</span><span class="cx"> A8A472A8151A825A004123FF /* GetPtr.h */,
</span><span class="lines">@@ -889,7 +890,6 @@
</span><span class="cx"> 1A3F6BE6174ADA2100B2EEA7 /* NeverDestroyed.h */,
</span><span class="cx"> 0F0D85B317234CB100338210 /* NoLock.h */,
</span><span class="cx"> A8A472D0151A825B004123FF /* Noncopyable.h */,
</span><del>- 83F2BADE1CF9524E003E99C3 /* NoncopyableFunction.h */,
</del><span class="cx"> A8A472D5151A825B004123FF /* NumberOfCores.cpp */,
</span><span class="cx"> A8A472D6151A825B004123FF /* NumberOfCores.h */,
</span><span class="cx"> 7E29C33D15FFD79B00516D61 /* ObjcRuntimeExtras.h */,
</span><span class="lines">@@ -1254,7 +1254,7 @@
</span><span class="cx"> A8A473D9151A825B004123FF /* HashTable.h in Headers */,
</span><span class="cx"> A8A473DA151A825B004123FF /* HashTraits.h in Headers */,
</span><span class="cx"> A8A473DB151A825B004123FF /* HexNumber.h in Headers */,
</span><del>- 83F2BADF1CF9524E003E99C3 /* NoncopyableFunction.h in Headers */,
</del><ins>+ 83F2BADF1CF9524E003E99C3 /* Function.h in Headers */,
</ins><span class="cx"> 2684D4361C000D400081D663 /* IndexSparseSet.h in Headers */,
</span><span class="cx"> A8A473DC151A825B004123FF /* InlineASM.h in Headers */,
</span><span class="cx"> A70DA0841799F04D00529A9B /* Insertion.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWTFwtfCrossThreadTaskh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/CrossThreadTask.h (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/CrossThreadTask.h 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WTF/wtf/CrossThreadTask.h 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><span class="cx"> #include <wtf/CrossThreadCopier.h>
</span><del>-#include <wtf/NoncopyableFunction.h>
</del><ins>+#include <wtf/Function.h>
</ins><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> public:
</span><span class="cx"> CrossThreadTask() = default;
</span><span class="cx">
</span><del>- CrossThreadTask(NoncopyableFunction<void ()>&& taskFunction)
</del><ins>+ CrossThreadTask(Function<void ()>&& taskFunction)
</ins><span class="cx"> : m_taskFunction(WTFMove(taskFunction))
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_taskFunction);
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- NoncopyableFunction<void ()> m_taskFunction;
</del><ins>+ Function<void ()> m_taskFunction;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template <typename T>
</span></span></pre></div>
<a id="trunkSourceWTFwtfFunctionhfromrev202438trunkSourceWTFwtfNoncopyableFunctionh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WTF/wtf/Function.h (from rev 202438, trunk/Source/WTF/wtf/NoncopyableFunction.h) (0 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Function.h (rev 0)
+++ trunk/Source/WTF/wtf/Function.h 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -0,0 +1,100 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include <memory>
+#include <wtf/FastMalloc.h>
+
+namespace WTF {
+
+template<typename> class Function;
+
+template <typename Out, typename... In>
+class Function<Out(In...)> {
+public:
+ Function() = default;
+ Function(std::nullptr_t) { }
+
+ template<typename CallableType, class = typename std::enable_if<std::is_rvalue_reference<CallableType&&>::value>::type>
+ Function(CallableType&& callable)
+ : m_callableWrapper(std::make_unique<CallableWrapper<CallableType>>(WTFMove(callable)))
+ {
+ }
+
+ Out operator()(In... in) const
+ {
+ if (m_callableWrapper)
+ return m_callableWrapper->call(std::forward<In>(in)...);
+ return Out();
+ }
+
+ explicit operator bool() const { return !!m_callableWrapper; }
+
+ template<typename CallableType, class = typename std::enable_if<std::is_rvalue_reference<CallableType&&>::value>::type>
+ Function& operator=(CallableType&& callable)
+ {
+ m_callableWrapper = std::make_unique<CallableWrapper<CallableType>>(WTFMove(callable));
+ return *this;
+ }
+
+ Function& operator=(std::nullptr_t)
+ {
+ m_callableWrapper = nullptr;
+ return *this;
+ }
+
+private:
+ class CallableWrapperBase {
+ WTF_MAKE_FAST_ALLOCATED;
+ public:
+ virtual ~CallableWrapperBase() { }
+
+ virtual Out call(In...) = 0;
+ };
+
+ template<typename CallableType>
+ class CallableWrapper : public CallableWrapperBase {
+ public:
+ explicit CallableWrapper(CallableType&& callable)
+ : m_callable(WTFMove(callable))
+ {
+ }
+
+ CallableWrapper(const CallableWrapper&) = delete;
+ CallableWrapper& operator=(const CallableWrapper&) = delete;
+
+ Out call(In... in) final { return m_callable(std::forward<In>(in)...); }
+
+ private:
+ CallableType m_callable;
+ };
+
+ std::unique_ptr<CallableWrapperBase> m_callableWrapper;
+};
+
+} // namespace WTF
+
+using WTF::Function;
</ins></span></pre></div>
<a id="trunkSourceWTFwtfFunctionDispatcherh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/FunctionDispatcher.h (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/FunctionDispatcher.h 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WTF/wtf/FunctionDispatcher.h 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #define FunctionDispatcher_h
</span><span class="cx">
</span><span class="cx"> #include <functional>
</span><del>-#include <wtf/NoncopyableFunction.h>
</del><ins>+#include <wtf/Function.h>
</ins><span class="cx"> #include <wtf/ThreadSafeRefCounted.h>
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</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<void ()>&&) = 0;
</del><ins>+ virtual void dispatch(Function<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 (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/MainThread.cpp 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WTF/wtf/MainThread.cpp 2016-06-24 19:40:19 UTC (rev 202439)
</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<void ()>>& functionQueue()
</del><ins>+static Deque<Function<void ()>>& functionQueue()
</ins><span class="cx"> {
</span><del>- static NeverDestroyed<Deque<NoncopyableFunction<void ()>>> functionQueue;
</del><ins>+ static NeverDestroyed<Deque<Function<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<void ()> function;
</del><ins>+ Function<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<void ()>&& function)
</del><ins>+void callOnMainThread(Function<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 (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/MainThread.h 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WTF/wtf/MainThread.h 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">
</span><span class="cx"> #include <functional>
</span><span class="cx"> #include <stdint.h>
</span><del>-#include <wtf/NoncopyableFunction.h>
</del><ins>+#include <wtf/Function.h>
</ins><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</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<void ()>&&);
</del><ins>+WTF_EXPORT_PRIVATE void callOnMainThread(Function<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="delfile"><h4>Deleted: trunk/Source/WTF/wtf/NoncopyableFunction.h (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/NoncopyableFunction.h 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WTF/wtf/NoncopyableFunction.h 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -1,100 +0,0 @@
</span><del>-/*
- * Copyright (C) 2016 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#include <memory>
-#include <wtf/FastMalloc.h>
-
-namespace WTF {
-
-template<typename> class NoncopyableFunction;
-
-template <typename Out, typename... In>
-class NoncopyableFunction<Out(In...)> {
-public:
- NoncopyableFunction() = default;
- NoncopyableFunction(std::nullptr_t) { }
-
- 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)))
- {
- }
-
- Out operator()(In... in) const
- {
- if (m_callableWrapper)
- return m_callableWrapper->call(std::forward<In>(in)...);
- return Out();
- }
-
- 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;
- }
-
- NoncopyableFunction& operator=(std::nullptr_t)
- {
- m_callableWrapper = nullptr;
- return *this;
- }
-
-private:
- class CallableWrapperBase {
- WTF_MAKE_FAST_ALLOCATED;
- public:
- virtual ~CallableWrapperBase() { }
-
- virtual Out call(In...) = 0;
- };
-
- template<typename CallableType>
- class CallableWrapper : public CallableWrapperBase {
- public:
- explicit CallableWrapper(CallableType&& callable)
- : m_callable(WTFMove(callable))
- {
- }
-
- CallableWrapper(const CallableWrapper&) = delete;
- CallableWrapper& operator=(const CallableWrapper&) = delete;
-
- Out call(In... in) final { return m_callable(std::forward<In>(in)...); }
-
- private:
- CallableType m_callable;
- };
-
- std::unique_ptr<CallableWrapperBase> m_callableWrapper;
-};
-
-} // namespace WTF
-
-using WTF::NoncopyableFunction;
</del></span></pre></div>
<a id="trunkSourceWTFwtfRunLoopcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/RunLoop.cpp (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/RunLoop.cpp 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WTF/wtf/RunLoop.cpp 2016-06-24 19:40:19 UTC (rev 202439)
</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<void ()> function;
</del><ins>+ Function<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<void ()> function;
</del><ins>+ Function<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<void ()>&& function)
</del><ins>+void RunLoop::dispatch(Function<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 (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/RunLoop.h 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WTF/wtf/RunLoop.h 2016-06-24 19:40:19 UTC (rev 202439)
</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<void ()>&&) override;
</del><ins>+ void dispatch(Function<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<void ()>&&);
</del><ins>+ WTF_EXPORT_PRIVATE void dispatchAfter(std::chrono::nanoseconds, Function<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<void ()>> m_functionQueue;
</del><ins>+ Deque<Function<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 (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/WorkQueue.h 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WTF/wtf/WorkQueue.h 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -70,8 +70,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<void ()>&&) override;
- WTF_EXPORT_PRIVATE void dispatchAfter(std::chrono::nanoseconds, NoncopyableFunction<void ()>&&);
</del><ins>+ WTF_EXPORT_PRIVATE void dispatch(Function<void ()>&&) override;
+ WTF_EXPORT_PRIVATE void dispatchAfter(std::chrono::nanoseconds, Function<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 class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> volatile LONG m_isWorkThreadRegistered;
</span><span class="cx">
</span><span class="cx"> Mutex m_functionQueueLock;
</span><del>- Vector<NoncopyableFunction<void ()>> m_functionQueue;
</del><ins>+ Vector<Function<void ()>> m_functionQueue;
</ins><span class="cx">
</span><span class="cx"> HANDLE m_timerQueue;
</span><span class="cx"> #elif USE(GLIB_EVENT_LOOP) || USE(GENERIC_EVENT_LOOP)
</span></span></pre></div>
<a id="trunkSourceWTFwtfcocoaWorkQueueCocoacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/cocoa/WorkQueueCocoa.cpp (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/cocoa/WorkQueueCocoa.cpp 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WTF/wtf/cocoa/WorkQueueCocoa.cpp 2016-06-24 19:40:19 UTC (rev 202439)
</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<void ()>&& function)
</del><ins>+void WorkQueue::dispatch(Function<void ()>&& function)
</ins><span class="cx"> {
</span><span class="cx"> ref();
</span><del>- auto* functionPtr = new NoncopyableFunction<void ()>(WTFMove(function));
</del><ins>+ auto* functionPtr = new Function<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<void ()>&& function)
</del><ins>+void WorkQueue::dispatchAfter(std::chrono::nanoseconds duration, Function<void ()>&& function)
</ins><span class="cx"> {
</span><span class="cx"> ref();
</span><del>- auto* functionPtr = new NoncopyableFunction<void ()>(WTFMove(function));
</del><ins>+ auto* functionPtr = new Function<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 (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/efl/DispatchQueueWorkItemEfl.h 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WTF/wtf/efl/DispatchQueueWorkItemEfl.h 2016-06-24 19:40:19 UTC (rev 202439)
</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<void ()>&& function)
</del><ins>+ WorkItem(Ref<WorkQueue>&& workQueue, Function<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<void ()> m_function;
</del><ins>+ Function<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<void ()>&& function, std::chrono::nanoseconds delayNanoSeconds)
</del><ins>+ static std::unique_ptr<TimerWorkItem> create(Ref<WorkQueue>&& workQueue, Function<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<void ()>&& function, double expirationTimeNanoSeconds)
</del><ins>+ TimerWorkItem(Ref<WorkQueue>&& workQueue, Function<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 (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/efl/WorkQueueEfl.cpp 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WTF/wtf/efl/WorkQueueEfl.cpp 2016-06-24 19:40:19 UTC (rev 202439)
</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<void ()>&& function)
</del><ins>+void WorkQueue::dispatch(Function<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<void ()>&& function)
</del><ins>+void WorkQueue::dispatchAfter(std::chrono::nanoseconds duration, Function<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 (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/generic/RunLoopGeneric.cpp 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WTF/wtf/generic/RunLoopGeneric.cpp 2016-06-24 19:40:19 UTC (rev 202439)
</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<void ()>&& function, double interval, bool repeating)
</del><ins>+ static RefPtr<ScheduledTask> create(Function<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<void ()>&& function, double interval, bool repeating)
</del><ins>+ ScheduledTask(Function<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<void ()> m_function;
</del><ins>+ Function<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<void ()>&& function)
</del><ins>+void RunLoop::dispatchAfter(std::chrono::nanoseconds delay, Function<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 (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/generic/WorkQueueGeneric.cpp 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WTF/wtf/generic/WorkQueueGeneric.cpp 2016-06-24 19:40:19 UTC (rev 202439)
</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<void ()>&& function)
</del><ins>+void WorkQueue::dispatch(Function<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<void ()>&& function)
</del><ins>+void WorkQueue::dispatchAfter(std::chrono::nanoseconds delay, Function<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 (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/glib/RunLoopGLib.cpp 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WTF/wtf/glib/RunLoopGLib.cpp 2016-06-24 19:40:19 UTC (rev 202439)
</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<void ()>&& function)
</del><ins>+ DispatchAfterContext(Function<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<void ()> m_function;
</del><ins>+ Function<void ()> m_function;
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-void RunLoop::dispatchAfter(std::chrono::nanoseconds duration, NoncopyableFunction<void ()>&& function)
</del><ins>+void RunLoop::dispatchAfter(std::chrono::nanoseconds duration, Function<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="trunkSourceWTFwtfwinWorkQueueWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/win/WorkQueueWin.cpp (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/win/WorkQueueWin.cpp 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WTF/wtf/win/WorkQueueWin.cpp 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> m_functionQueueLock.lock();
</span><span class="cx">
</span><span class="cx"> while (!m_functionQueue.isEmpty()) {
</span><del>- Vector<NoncopyableFunction<void ()>> functionQueue;
</del><ins>+ Vector<Function<void ()>> functionQueue;
</ins><span class="cx"> m_functionQueue.swap(functionQueue);
</span><span class="cx">
</span><span class="cx"> // Allow more work to be scheduled while we're not using the queue directly.
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> ::DeleteTimerQueueEx(m_timerQueue, 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkQueue::dispatch(NoncopyableFunction<void ()>&& function)
</del><ins>+void WorkQueue::dispatch(Function<void ()>&& function)
</ins><span class="cx"> {
</span><span class="cx"> MutexLocker locker(m_functionQueueLock);
</span><span class="cx"> ref();
</span><span class="lines">@@ -118,7 +118,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<void ()> function;
</del><ins>+ Function<void ()> function;
</ins><span class="cx"> Mutex timerMutex;
</span><span class="cx"> HANDLE timer;
</span><span class="cx">
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkQueue::dispatchAfter(std::chrono::nanoseconds duration, NoncopyableFunction<void ()>&& function)
</del><ins>+void WorkQueue::dispatchAfter(std::chrono::nanoseconds duration, Function<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 (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebCore/ChangeLog 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -1,3 +1,58 @@
</span><ins>+2016-06-21 Anders Carlsson <andersca@apple.com>
+
+ Rename NoncopyableFunction to Function
+ https://bugs.webkit.org/show_bug.cgi?id=158354
+
+ Reviewed by Chris Dumez.
+
+ * Modules/mediastream/MediaEndpointPeerConnection.cpp:
+ (WebCore::MediaEndpointPeerConnection::runTask):
+ * Modules/mediastream/MediaEndpointPeerConnection.h:
+ * Modules/webaudio/AudioDestinationNode.h:
+ (WebCore::AudioDestinationNode::resume):
+ (WebCore::AudioDestinationNode::suspend):
+ (WebCore::AudioDestinationNode::close):
+ * Modules/webaudio/DefaultAudioDestinationNode.cpp:
+ (WebCore::DefaultAudioDestinationNode::resume):
+ (WebCore::DefaultAudioDestinationNode::suspend):
+ (WebCore::DefaultAudioDestinationNode::close):
+ * Modules/webaudio/DefaultAudioDestinationNode.h:
+ * dom/ActiveDOMCallbackMicrotask.cpp:
+ (WebCore::ActiveDOMCallbackMicrotask::ActiveDOMCallbackMicrotask):
+ * dom/ActiveDOMCallbackMicrotask.h:
+ * dom/ScriptExecutionContext.h:
+ (WebCore::ScriptExecutionContext::Task::Task):
+ * fileapi/AsyncFileStream.cpp:
+ (WebCore::callOnFileThread):
+ (WebCore::AsyncFileStream::perform):
+ * fileapi/AsyncFileStream.h:
+ * page/FrameView.cpp:
+ (WebCore::FrameView::queuePostLayoutCallback):
+ (WebCore::FrameView::flushPostLayoutTasksQueue):
+ * page/FrameView.h:
+ * page/scrolling/ScrollingThread.cpp:
+ (WebCore::ScrollingThread::dispatch):
+ (WebCore::ScrollingThread::dispatchBarrier):
+ (WebCore::ScrollingThread::dispatchFunctionsFromScrollingThread):
+ * page/scrolling/ScrollingThread.h:
+ * platform/GenericTaskQueue.cpp:
+ (WebCore::TaskDispatcher<Timer>::postTask):
+ * platform/GenericTaskQueue.h:
+ (WebCore::TaskDispatcher::postTask):
+ * 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):
+ * style/StyleTreeResolver.cpp:
+ (WebCore::Style::postResolutionCallbackQueue):
+ (WebCore::Style::queuePostResolutionCallback):
+ * style/StyleTreeResolver.h:
+
</ins><span class="cx"> 2016-06-24 Amir Alavi <aalavi@apple.com>
</span><span class="cx">
</span><span class="cx"> Use _CFHTTPCookieStorageGetDefault directly instead of NSHTTPCookieStorage to get default cookie storage
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaEndpointPeerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaEndpointPeerConnection::runTask(NoncopyableFunction<void ()>&& task)
</del><ins>+void MediaEndpointPeerConnection::runTask(Function<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 (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.h 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.h 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> #include "MediaEndpointSessionDescription.h"
</span><span class="cx"> #include "NotImplemented.h"
</span><span class="cx"> #include "PeerConnectionBackend.h"
</span><del>-#include <wtf/NoncopyableFunction.h>
</del><ins>+#include <wtf/Function.h>
</ins><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> void clearNegotiationNeededState() override { m_negotiationNeeded = false; };
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- void runTask(NoncopyableFunction<void ()>&&);
</del><ins>+ void runTask(Function<void ()>&&);
</ins><span class="cx"> void startRunningTasks();
</span><span class="cx">
</span><span class="cx"> void createOfferTask(RTCOfferOptions&, PeerConnection::SessionDescriptionPromise&);
</span><span class="lines">@@ -113,7 +113,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<void ()> m_initialDeferredTask;
</del><ins>+ Function<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="trunkSourceWebCoreModuleswebaudioAudioDestinationNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/AudioDestinationNode.h (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/AudioDestinationNode.h 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebCore/Modules/webaudio/AudioDestinationNode.h 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include "AudioIOCallback.h"
</span><span class="cx"> #include "AudioNode.h"
</span><span class="cx"> #include "AudioSourceProvider.h"
</span><del>-#include <wtf/NoncopyableFunction.h>
</del><ins>+#include <wtf/Function.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -59,9 +59,9 @@
</span><span class="cx"> virtual void enableInput(const String& inputDeviceId) = 0;
</span><span class="cx">
</span><span class="cx"> virtual void startRendering() = 0;
</span><del>- virtual void resume(NoncopyableFunction<void ()>&&) { }
- virtual void suspend(NoncopyableFunction<void ()>&&) { }
- virtual void close(NoncopyableFunction<void ()>&&) { }
</del><ins>+ virtual void resume(Function<void ()>&&) { }
+ virtual void suspend(Function<void ()>&&) { }
+ virtual void close(Function<void ()>&&) { }
</ins><span class="cx">
</span><span class="cx"> virtual bool isPlaying() { return false; }
</span><span class="cx"> void isPlayingDidChange() override;
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioDefaultAudioDestinationNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/DefaultAudioDestinationNode.cpp (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/DefaultAudioDestinationNode.cpp 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebCore/Modules/webaudio/DefaultAudioDestinationNode.cpp 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> m_destination->start();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DefaultAudioDestinationNode::resume(NoncopyableFunction<void ()>&& function)
</del><ins>+void DefaultAudioDestinationNode::resume(Function<void ()>&& function)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isInitialized());
</span><span class="cx"> if (isInitialized())
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> scriptExecutionContext->postTask(WTFMove(function));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DefaultAudioDestinationNode::suspend(NoncopyableFunction<void ()>&& function)
</del><ins>+void DefaultAudioDestinationNode::suspend(Function<void ()>&& function)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isInitialized());
</span><span class="cx"> if (isInitialized())
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> scriptExecutionContext->postTask(WTFMove(function));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DefaultAudioDestinationNode::close(NoncopyableFunction<void()>&& function)
</del><ins>+void DefaultAudioDestinationNode::close(Function<void()>&& function)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isInitialized());
</span><span class="cx"> uninitialize();
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioDefaultAudioDestinationNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/DefaultAudioDestinationNode.h (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/DefaultAudioDestinationNode.h 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebCore/Modules/webaudio/DefaultAudioDestinationNode.h 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -50,9 +50,9 @@
</span><span class="cx"> // AudioDestinationNode
</span><span class="cx"> void enableInput(const String& inputDeviceId) override;
</span><span class="cx"> void startRendering() override;
</span><del>- void resume(NoncopyableFunction<void ()>&&) override;
- void suspend(NoncopyableFunction<void ()>&&) override;
- void close(NoncopyableFunction<void ()>&&) override;
</del><ins>+ void resume(Function<void ()>&&) override;
+ void suspend(Function<void ()>&&) override;
+ void close(Function<void ()>&&) override;
</ins><span class="cx"> unsigned long maxChannelCount() const override;
</span><span class="cx"> bool isPlaying() override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsSerializedScriptValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -2798,7 +2798,7 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SerializedScriptValue::writeBlobsToDiskForIndexedDB(NoncopyableFunction<void (const IDBValue&)>&& completionHandler)
</del><ins>+void SerializedScriptValue::writeBlobsToDiskForIndexedDB(WTF::Function<void (const IDBValue&)>&& completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> ASSERT(hasBlobURLs());
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsSerializedScriptValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/SerializedScriptValue.h (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/SerializedScriptValue.h 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebCore/bindings/js/SerializedScriptValue.h 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #include <runtime/ArrayBuffer.h>
</span><span class="cx"> #include <runtime/JSCJSValue.h>
</span><span class="cx"> #include <wtf/Forward.h>
</span><del>-#include <wtf/NoncopyableFunction.h>
</del><ins>+#include <wtf/Function.h>
</ins><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="cx"> Vector<String> blobURLsIsolatedCopy() const;
</span><del>- void writeBlobsToDiskForIndexedDB(NoncopyableFunction<void (const IDBValue&)>&& completionHandler);
</del><ins>+ void writeBlobsToDiskForIndexedDB(Function<void (const IDBValue&)>&& completionHandler);
</ins><span class="cx"> IDBValue writeBlobsToDiskForIndexedDBSynchronously();
</span><span class="cx"> #endif // ENABLE(INDEXED_DATABASE)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomActiveDOMCallbackMicrotaskcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ActiveDOMCallbackMicrotask.cpp (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ActiveDOMCallbackMicrotask.cpp 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebCore/dom/ActiveDOMCallbackMicrotask.cpp 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-ActiveDOMCallbackMicrotask::ActiveDOMCallbackMicrotask(MicrotaskQueue& queue, ScriptExecutionContext& scriptExecutionContext, NoncopyableFunction<void()>&& task)
</del><ins>+ActiveDOMCallbackMicrotask::ActiveDOMCallbackMicrotask(MicrotaskQueue& queue, ScriptExecutionContext& scriptExecutionContext, Function<void()>&& task)
</ins><span class="cx"> : ActiveDOMCallback(&scriptExecutionContext)
</span><span class="cx"> , m_queue(queue)
</span><span class="cx"> , m_task(WTFMove(task))
</span></span></pre></div>
<a id="trunkSourceWebCoredomActiveDOMCallbackMicrotaskh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ActiveDOMCallbackMicrotask.h (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ActiveDOMCallbackMicrotask.h 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebCore/dom/ActiveDOMCallbackMicrotask.h 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx">
</span><span class="cx"> #include "ActiveDOMCallback.h"
</span><span class="cx"> #include "Microtasks.h"
</span><del>-#include <wtf/NoncopyableFunction.h>
</del><ins>+#include <wtf/Function.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> class ActiveDOMCallbackMicrotask final : public Microtask, public ActiveDOMCallback {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- WEBCORE_EXPORT ActiveDOMCallbackMicrotask(MicrotaskQueue&, ScriptExecutionContext&, NoncopyableFunction<void()>&&);
</del><ins>+ WEBCORE_EXPORT ActiveDOMCallbackMicrotask(MicrotaskQueue&, ScriptExecutionContext&, Function<void()>&&);
</ins><span class="cx"> WEBCORE_EXPORT virtual ~ActiveDOMCallbackMicrotask();
</span><span class="cx">
</span><span class="cx"> Result run() override;
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> // be accessed via the ScriptExecutionContext, which should hold a reference to the relevent
</span><span class="cx"> // queue.
</span><span class="cx"> MicrotaskQueue& m_queue;
</span><del>- NoncopyableFunction<void()> m_task;
</del><ins>+ Function<void()> m_task;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptExecutionContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.h (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptExecutionContext.h 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.h 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -33,8 +33,8 @@
</span><span class="cx"> #include "Supplementable.h"
</span><span class="cx"> #include <runtime/ConsoleTypes.h>
</span><span class="cx"> #include <wtf/CrossThreadTask.h>
</span><ins>+#include <wtf/Function.h>
</ins><span class="cx"> #include <wtf/HashSet.h>
</span><del>-#include <wtf/NoncopyableFunction.h>
</del><span class="cx">
</span><span class="cx"> namespace Deprecated {
</span><span class="cx"> class ScriptValue;
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx"> public:
</span><span class="cx"> enum CleanupTaskTag { CleanupTask };
</span><span class="cx">
</span><del>- template<typename T, typename = typename std::enable_if<!std::is_base_of<Task, T>::value && std::is_convertible<T, NoncopyableFunction<void (ScriptExecutionContext&)>>::value>::type>
</del><ins>+ template<typename T, typename = typename std::enable_if<!std::is_base_of<Task, T>::value && std::is_convertible<T, WTF::Function<void (ScriptExecutionContext&)>>::value>::type>
</ins><span class="cx"> Task(T task)
</span><span class="cx"> : m_task(WTFMove(task))
</span><span class="cx"> , m_isCleanupTask(false)
</span><span class="lines">@@ -145,13 +145,13 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Task(NoncopyableFunction<void ()>&& task)
</del><ins>+ Task(WTF::Function<void ()>&& task)
</ins><span class="cx"> : m_task([task = WTFMove(task)](ScriptExecutionContext&) { task(); })
</span><span class="cx"> , m_isCleanupTask(false)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- template<typename T, typename = typename std::enable_if<std::is_convertible<T, NoncopyableFunction<void (ScriptExecutionContext&)>>::value>::type>
</del><ins>+ template<typename T, typename = typename std::enable_if<std::is_convertible<T, WTF::Function<void (ScriptExecutionContext&)>>::value>::type>
</ins><span class="cx"> Task(CleanupTaskTag, T task)
</span><span class="cx"> : m_task(WTFMove(task))
</span><span class="cx"> , m_isCleanupTask(true)
</span><span class="lines">@@ -162,7 +162,7 @@
</span><span class="cx"> bool isCleanupTask() const { return m_isCleanupTask; }
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- NoncopyableFunction<void (ScriptExecutionContext&)> m_task;
</del><ins>+ WTF::Function<void (ScriptExecutionContext&)> m_task;
</ins><span class="cx"> bool m_isCleanupTask;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiAsyncFileStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/AsyncFileStream.cpp (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/AsyncFileStream.cpp 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebCore/fileapi/AsyncFileStream.cpp 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -36,10 +36,10 @@
</span><span class="cx"> #include "FileStreamClient.h"
</span><span class="cx"> #include "URL.h"
</span><span class="cx"> #include <wtf/AutodrainedPool.h>
</span><ins>+#include <wtf/Function.h>
</ins><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx"> #include <wtf/MessageQueue.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><del>-#include <wtf/NoncopyableFunction.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</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<void ()>&& function)
</del><ins>+static void callOnFileThread(Function<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<void ()>>> queue;
</del><ins>+ static NeverDestroyed<MessageQueue<Function<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<void ()>>(WTFMove(function)));
</del><ins>+ queue.get().append(std::make_unique<Function<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(NoncopyableFunction<std::function<void(FileStreamClient&)>(FileStream&)>&& operation)
</del><ins>+void AsyncFileStream::perform(Function<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></pre></div>
<a id="trunkSourceWebCorefileapiAsyncFileStreamh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/AsyncFileStream.h (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/AsyncFileStream.h 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebCore/fileapi/AsyncFileStream.h 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">
</span><span class="cx"> #include <functional>
</span><span class="cx"> #include <wtf/Forward.h>
</span><del>-#include <wtf/NoncopyableFunction.h>
</del><ins>+#include <wtf/Function.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void start();
</span><del>- void perform(NoncopyableFunction<std::function<void(FileStreamClient&)>(FileStream&)>&&);
</del><ins>+ void perform(Function<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="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebCore/page/FrameView.cpp 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -3145,7 +3145,7 @@
</span><span class="cx"> updateEmbeddedObjectsTimerFired();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameView::queuePostLayoutCallback(NoncopyableFunction<void()>&& callback)
</del><ins>+void FrameView::queuePostLayoutCallback(Function<void()>&& callback)
</ins><span class="cx"> {
</span><span class="cx"> m_postLayoutCallbackQueue.append(WTFMove(callback));
</span><span class="cx"> }
</span><span class="lines">@@ -3158,7 +3158,7 @@
</span><span class="cx"> if (!m_postLayoutCallbackQueue.size())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- Vector<NoncopyableFunction<void()>> queue = WTFMove(m_postLayoutCallbackQueue);
</del><ins>+ Vector<Function<void()>> queue = WTFMove(m_postLayoutCallbackQueue);
</ins><span class="cx"> for (auto& task : queue)
</span><span class="cx"> task();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.h (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.h 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebCore/page/FrameView.h 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -35,9 +35,9 @@
</span><span class="cx"> #include "ScrollView.h"
</span><span class="cx"> #include <memory>
</span><span class="cx"> #include <wtf/Forward.h>
</span><ins>+#include <wtf/Function.h>
</ins><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/ListHashSet.h>
</span><del>-#include <wtf/NoncopyableFunction.h>
</del><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> void scheduleRelayout();
</span><span class="cx"> void scheduleRelayoutOfSubtree(RenderElement&);
</span><span class="cx"> void unscheduleRelayout();
</span><del>- void queuePostLayoutCallback(NoncopyableFunction<void()>&&);
</del><ins>+ void queuePostLayoutCallback(Function<void()>&&);
</ins><span class="cx"> bool layoutPending() const;
</span><span class="cx"> bool isInLayout() const { return m_layoutPhase != OutsideLayout; }
</span><span class="cx"> bool isInRenderTreeLayout() const { return m_layoutPhase == InRenderTreeLayout; }
</span><span class="lines">@@ -828,7 +828,7 @@
</span><span class="cx"> ScrollPinningBehavior m_scrollPinningBehavior;
</span><span class="cx">
</span><span class="cx"> IntRect* m_cachedWindowClipRect { nullptr };
</span><del>- Vector<NoncopyableFunction<void()>> m_postLayoutCallbackQueue;
</del><ins>+ Vector<Function<void()>> m_postLayoutCallbackQueue;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> inline void FrameView::incrementVisuallyNonEmptyCharacterCount(unsigned count)
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingThread.cpp (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingThread.cpp 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebCore/page/scrolling/ScrollingThread.cpp 2016-06-24 19:40:19 UTC (rev 202439)
</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<void ()>&& function)
</del><ins>+void ScrollingThread::dispatch(Function<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<void ()>&& function)
</del><ins>+void ScrollingThread::dispatchBarrier(Function<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<void ()>> functions;
</del><ins>+ Vector<Function<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 (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingThread.h 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebCore/page/scrolling/ScrollingThread.h 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -31,9 +31,9 @@
</span><span class="cx"> #include <functional>
</span><span class="cx"> #include <wtf/Condition.h>
</span><span class="cx"> #include <wtf/Forward.h>
</span><ins>+#include <wtf/Function.h>
</ins><span class="cx"> #include <wtf/Lock.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><del>-#include <wtf/NoncopyableFunction.h>
</del><span class="cx"> #include <wtf/Threading.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</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<void ()>&&);
</del><ins>+ WEBCORE_EXPORT static void dispatch(Function<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<void ()>&&);
</del><ins>+ WEBCORE_EXPORT static void dispatchBarrier(Function<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<void ()>> m_functions;
</del><ins>+ Vector<Function<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="trunkSourceWebCoreplatformGenericTaskQueuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/GenericTaskQueue.cpp (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/GenericTaskQueue.cpp 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebCore/platform/GenericTaskQueue.cpp 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TaskDispatcher<Timer>::postTask(NoncopyableFunction<void()>&& function)
</del><ins>+void TaskDispatcher<Timer>::postTask(Function<void()>&& function)
</ins><span class="cx"> {
</span><span class="cx"> m_pendingTasks.append(WTFMove(function));
</span><span class="cx"> pendingDispatchers().append(m_weakPtrFactory.createWeakPtr());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformGenericTaskQueueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/GenericTaskQueue.h (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/GenericTaskQueue.h 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebCore/platform/GenericTaskQueue.h 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx">
</span><span class="cx"> #include "Timer.h"
</span><span class="cx"> #include <wtf/Deque.h>
</span><del>-#include <wtf/NoncopyableFunction.h>
</del><ins>+#include <wtf/Function.h>
</ins><span class="cx"> #include <wtf/WeakPtr.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void postTask(NoncopyableFunction<void()>&& f)
</del><ins>+ void postTask(Function<void()>&& f)
</ins><span class="cx"> {
</span><span class="cx"> m_context.postTask(WTFMove(f));
</span><span class="cx"> }
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> class TaskDispatcher<Timer> {
</span><span class="cx"> public:
</span><span class="cx"> TaskDispatcher();
</span><del>- void postTask(NoncopyableFunction<void()>&&);
</del><ins>+ void postTask(Function<void()>&&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> static Timer& sharedTimer();
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> void dispatchOneTask();
</span><span class="cx">
</span><span class="cx"> WeakPtrFactory<TaskDispatcher> m_weakPtrFactory;
</span><del>- Deque<NoncopyableFunction<void()>> m_pendingTasks;
</del><ins>+ Deque<Function<void()>> m_pendingTasks;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template <typename T>
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- typedef NoncopyableFunction<void()> TaskFunction;
</del><ins>+ typedef Function<void()> TaskFunction;
</ins><span class="cx">
</span><span class="cx"> void enqueueTask(TaskFunction&& task)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaStreamAVFObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -30,8 +30,8 @@
</span><span class="cx">
</span><span class="cx"> #include "MediaPlayerPrivate.h"
</span><span class="cx"> #include "MediaStreamPrivate.h"
</span><ins>+#include <wtf/Function.h>
</ins><span class="cx"> #include <wtf/MediaTime.h>
</span><del>-#include <wtf/NoncopyableFunction.h>
</del><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/WeakPtr.h>
</span><span class="cx">
</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<void ()>&&);
</del><ins>+ void scheduleDeferredTask(Function<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 (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm 2016-06-24 19:40:19 UTC (rev 202439)
</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<void ()>&& function)
</del><ins>+void MediaPlayerPrivateMediaStreamAVFObjC::scheduleDeferredTask(Function<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 (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp 2016-06-24 19:40:19 UTC (rev 202439)
</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<void ()>&& function)
</del><ins>+void MediaStreamPrivate::scheduleDeferredTask(Function<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 (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -39,9 +39,9 @@
</span><span class="cx"> #include "FloatSize.h"
</span><span class="cx"> #include "MediaStreamTrack.h"
</span><span class="cx"> #include "MediaStreamTrackPrivate.h"
</span><ins>+#include <wtf/Function.h>
</ins><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/MediaTime.h>
</span><del>-#include <wtf/NoncopyableFunction.h>
</del><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/Vector.h>
</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<void ()>&&);
</del><ins>+ void scheduleDeferredTask(Function<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 (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.h 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.h 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #include "GenericTaskQueue.h"
</span><span class="cx"> #include "RealtimeMediaSource.h"
</span><span class="cx"> #include "Timer.h"
</span><del>-#include <wtf/NoncopyableFunction.h>
</del><ins>+#include <wtf/Function.h>
</ins><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #include <wtf/WeakPtr.h>
</span><span class="cx">
</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<void ()>&&);
</del><ins>+ void scheduleDeferredTask(Function<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 (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm 2016-06-24 19:40:19 UTC (rev 202439)
</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<void ()>&& function)
</del><ins>+void AVMediaCaptureSource::scheduleDeferredTask(Function<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="trunkSourceWebCoreplatformnetworkBlobRegistryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/BlobRegistry.h (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/BlobRegistry.h 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebCore/platform/network/BlobRegistry.h 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">
</span><span class="cx"> #include <functional>
</span><span class="cx"> #include <wtf/Forward.h>
</span><del>-#include <wtf/NoncopyableFunction.h>
</del><ins>+#include <wtf/Function.h>
</ins><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx">
</span><span class="cx"> virtual unsigned long long blobSize(const URL&) = 0;
</span><span class="cx">
</span><del>- virtual void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, NoncopyableFunction<void (const Vector<String>& filePaths)>&& completionHandler) = 0;
</del><ins>+ virtual void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, Function<void (const Vector<String>& filePaths)>&& completionHandler) = 0;
</ins><span class="cx">
</span><span class="cx"> virtual bool isBlobRegistryImpl() const { return false; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkBlobRegistryImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/BlobRegistryImpl.cpp (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/BlobRegistryImpl.cpp 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebCore/platform/network/BlobRegistryImpl.cpp 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -252,7 +252,7 @@
</span><span class="cx"> Vector<std::pair<String, ThreadSafeDataBuffer>> filePathsOrDataBuffers;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-void BlobRegistryImpl::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, NoncopyableFunction<void (const Vector<String>& filePaths)>&& completionHandler)
</del><ins>+void BlobRegistryImpl::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, Function<void (const Vector<String>& filePaths)>&& completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> Vector<BlobForFileWriting> blobsForWriting;
</span><span class="cx"> for (auto& url : blobURLs) {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkBlobRegistryImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/BlobRegistryImpl.h (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/BlobRegistryImpl.h 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebCore/platform/network/BlobRegistryImpl.h 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx">
</span><span class="cx"> unsigned long long blobSize(const URL&) override;
</span><span class="cx">
</span><del>- void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, NoncopyableFunction<void (const Vector<String>& filePaths)>&& completionHandler) override;
</del><ins>+ void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, Function<void (const Vector<String>& filePaths)>&& completionHandler) override;
</ins><span class="cx">
</span><span class="cx"> HashMap<String, RefPtr<BlobData>> m_blobs;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleTreeResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleTreeResolver.cpp (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleTreeResolver.cpp 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebCore/style/StyleTreeResolver.cpp 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -532,13 +532,13 @@
</span><span class="cx"> return WTFMove(m_update);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Vector<NoncopyableFunction<void ()>>& postResolutionCallbackQueue()
</del><ins>+static Vector<Function<void ()>>& postResolutionCallbackQueue()
</ins><span class="cx"> {
</span><del>- static NeverDestroyed<Vector<NoncopyableFunction<void ()>>> vector;
</del><ins>+ static NeverDestroyed<Vector<Function<void ()>>> vector;
</ins><span class="cx"> return vector;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void queuePostResolutionCallback(NoncopyableFunction<void ()>&& callback)
</del><ins>+void queuePostResolutionCallback(Function<void ()>&& callback)
</ins><span class="cx"> {
</span><span class="cx"> postResolutionCallbackQueue().append(WTFMove(callback));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleTreeResolverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleTreeResolver.h (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleTreeResolver.h 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebCore/style/StyleTreeResolver.h 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -32,9 +32,8 @@
</span><span class="cx"> #include "StyleChange.h"
</span><span class="cx"> #include "StyleSharingResolver.h"
</span><span class="cx"> #include "StyleUpdate.h"
</span><del>-#include <functional>
</del><ins>+#include <wtf/Function.h>
</ins><span class="cx"> #include <wtf/HashMap.h>
</span><del>-#include <wtf/NoncopyableFunction.h>
</del><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -110,7 +109,7 @@
</span><span class="cx"> std::unique_ptr<Update> m_update;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-void queuePostResolutionCallback(NoncopyableFunction<void ()>&&);
</del><ins>+void queuePostResolutionCallback(Function<void ()>&&);
</ins><span class="cx"> bool postResolutionCallbacksAreSuspended();
</span><span class="cx">
</span><span class="cx"> bool isPlaceholderStyle(const RenderStyle&);
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebKit/ChangeLog 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-06-21 Anders Carlsson <andersca@apple.com>
+
+ Rename NoncopyableFunction to Function
+ https://bugs.webkit.org/show_bug.cgi?id=158354
+
+ Reviewed by Chris Dumez.
+
+ * 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-06-22 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Move the WebKitLegacy Apple Pay code to the open source repository
</span></span></pre></div>
<a id="trunkSourceWebKitStorageStorageSyncManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Storage/StorageSyncManager.cpp (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Storage/StorageSyncManager.cpp 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebKit/Storage/StorageSyncManager.cpp 2016-06-24 19:40:19 UTC (rev 202439)
</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<void ()>&& function)
</del><ins>+void StorageSyncManager::dispatch(Function<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 (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Storage/StorageSyncManager.h 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebKit/Storage/StorageSyncManager.h 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include <functional>
</span><span class="cx"> #include <wtf/Forward.h>
</span><del>-#include <wtf/NoncopyableFunction.h>
</del><ins>+#include <wtf/Function.h>
</ins><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</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<void ()>&&);
</del><ins>+ void dispatch(Function<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 (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Storage/StorageThread.cpp 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebKit/Storage/StorageThread.cpp 2016-06-24 19:40:19 UTC (rev 202439)
</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<void ()>&& function)
</del><ins>+void StorageThread::dispatch(Function<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<void ()>>(WTFMove(function)));
</del><ins>+ m_queue.append(std::make_unique<Function<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<void ()>>([this] {
</del><ins>+ m_queue.append(std::make_unique<Function<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 (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Storage/StorageThread.h 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebKit/Storage/StorageThread.h 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -26,10 +26,9 @@
</span><span class="cx"> #ifndef StorageThread_h
</span><span class="cx"> #define StorageThread_h
</span><span class="cx">
</span><del>-#include <functional>
</del><ins>+#include <wtf/Function.h>
</ins><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/MessageQueue.h>
</span><del>-#include <wtf/NoncopyableFunction.h>
</del><span class="cx"> #include <wtf/Threading.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -46,7 +45,7 @@
</span><span class="cx"> bool start();
</span><span class="cx"> void terminate();
</span><span class="cx">
</span><del>- void dispatch(NoncopyableFunction<void ()>&&);
</del><ins>+ void dispatch(Function<void ()>&&);
</ins><span class="cx">
</span><span class="cx"> static void releaseFastMallocFreeMemoryInAllThreads();
</span><span class="cx">
</span><span class="lines">@@ -59,7 +58,7 @@
</span><span class="cx"> void performTerminate();
</span><span class="cx">
</span><span class="cx"> ThreadIdentifier m_threadID;
</span><del>- MessageQueue<NoncopyableFunction<void ()>> m_queue;
</del><ins>+ MessageQueue<Function<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 (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebKit2/ChangeLog 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-06-21 Anders Carlsson <andersca@apple.com>
+
+ Rename NoncopyableFunction to Function
+ https://bugs.webkit.org/show_bug.cgi?id=158354
+
+ Reviewed by Chris Dumez.
+
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::fetchDiskCacheEntries):
+ (WebKit::NetworkProcess::fetchWebsiteData):
+ (WebKit::clearDiskCacheEntries):
+ * NetworkProcess/NetworkProcess.h:
+ * NetworkProcess/cache/NetworkCache.cpp:
+ (WebKit::NetworkCache::Cache::traverse):
+ * NetworkProcess/cache/NetworkCache.h:
+ * NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp:
+ (WebKit::NetworkCache::runTaskInQueue):
+ * NetworkProcess/cache/NetworkCacheStorage.h:
+
</ins><span class="cx"> 2016-06-22 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Move WebKit2 Apple Pay code to the open source repository
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessFileAPINetworkBlobRegistrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> return blobRegistry().blobSize(url);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkBlobRegistry::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, NoncopyableFunction<void(const Vector<String>&)>&& completionHandler)
</del><ins>+void NetworkBlobRegistry::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, Function<void(const Vector<String>&)>&& completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> blobRegistry().writeBlobsToTemporaryFiles(blobURLs, WTFMove(completionHandler));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessFileAPINetworkBlobRegistryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.h (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.h 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.h 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -27,10 +27,9 @@
</span><span class="cx"> #define NetworkBlobRegistry_h
</span><span class="cx">
</span><span class="cx"> #include <WebCore/URLHash.h>
</span><del>-#include <functional>
</del><ins>+#include <wtf/Function.h>
</ins><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><del>-#include <wtf/NoncopyableFunction.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> class BlobDataFileReference;
</span><span class="lines">@@ -55,7 +54,7 @@
</span><span class="cx"> void registerBlobURLForSlice(NetworkConnectionToWebProcess*, const WebCore::URL&, const WebCore::URL& srcURL, int64_t start, int64_t end);
</span><span class="cx"> void unregisterBlobURL(NetworkConnectionToWebProcess*, const WebCore::URL&);
</span><span class="cx"> uint64_t blobSize(NetworkConnectionToWebProcess*, const WebCore::URL&);
</span><del>- void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, NoncopyableFunction<void(const Vector<String>&)>&& completionHandler);
</del><ins>+ void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, Function<void (const Vector<String>&)>&& completionHandler);
</ins><span class="cx">
</span><span class="cx"> void connectionToWebProcessDidClose(NetworkConnectionToWebProcess*);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkDataTaskh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.h (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.h 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.h 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> #include <WebCore/ResourceLoaderOptions.h>
</span><span class="cx"> #include <WebCore/ResourceRequest.h>
</span><span class="cx"> #include <WebCore/Timer.h>
</span><del>-#include <wtf/NoncopyableFunction.h>
</del><ins>+#include <wtf/Function.h>
</ins><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -63,9 +63,9 @@
</span><span class="cx"> RejectProtectionSpace
</span><span class="cx"> };
</span><span class="cx">
</span><del>-typedef NoncopyableFunction<void(const WebCore::ResourceRequest&)> RedirectCompletionHandler;
-typedef NoncopyableFunction<void(AuthenticationChallengeDisposition, const WebCore::Credential&)> ChallengeCompletionHandler;
-typedef NoncopyableFunction<void(WebCore::PolicyAction)> ResponseCompletionHandler;
</del><ins>+typedef Function<void(const WebCore::ResourceRequest&)> RedirectCompletionHandler;
+typedef Function<void(AuthenticationChallengeDisposition, const WebCore::Credential&)> ChallengeCompletionHandler;
+typedef Function<void(WebCore::PolicyAction)> ResponseCompletionHandler;
</ins><span class="cx">
</span><span class="cx"> class NetworkDataTaskClient {
</span><span class="cx"> public:
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -293,7 +293,7 @@
</span><span class="cx"> SessionTracker::destroySession(sessionID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkProcess::grantSandboxExtensionsToDatabaseProcessForBlobs(const Vector<String>& filenames, NoncopyableFunction<void ()>&& completionHandler)
</del><ins>+void NetworkProcess::grantSandboxExtensionsToDatabaseProcessForBlobs(const Vector<String>& filenames, Function<void ()>&& completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> static uint64_t lastRequestID;
</span><span class="cx">
</span><span class="lines">@@ -308,7 +308,7 @@
</span><span class="cx"> handler();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void fetchDiskCacheEntries(SessionID sessionID, OptionSet<WebsiteDataFetchOption> fetchOptions, NoncopyableFunction<void (Vector<WebsiteData::Entry>)>&& completionHandler)
</del><ins>+static void fetchDiskCacheEntries(SessionID sessionID, OptionSet<WebsiteDataFetchOption> fetchOptions, Function<void (Vector<WebsiteData::Entry>)>&& 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">@@ -352,7 +352,7 @@
</span><span class="cx"> void NetworkProcess::fetchWebsiteData(SessionID sessionID, OptionSet<WebsiteDataType> websiteDataTypes, OptionSet<WebsiteDataFetchOption> fetchOptions, uint64_t callbackID)
</span><span class="cx"> {
</span><span class="cx"> struct CallbackAggregator final : public RefCounted<CallbackAggregator> {
</span><del>- explicit CallbackAggregator(NoncopyableFunction<void (WebsiteData)>&& completionHandler)
</del><ins>+ explicit CallbackAggregator(Function<void (WebsiteData)>&& completionHandler)
</ins><span class="cx"> : m_completionHandler(WTFMove(completionHandler))
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -366,7 +366,7 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>- NoncopyableFunction<void (WebsiteData)> m_completionHandler;
</del><ins>+ Function<void (WebsiteData)> m_completionHandler;
</ins><span class="cx"> WebsiteData m_websiteData;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -412,7 +412,7 @@
</span><span class="cx"> completionHandler();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void clearDiskCacheEntries(const Vector<SecurityOriginData>& origins, NoncopyableFunction<void ()>&& completionHandler)
</del><ins>+static void clearDiskCacheEntries(const Vector<SecurityOriginData>& origins, 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></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -35,8 +35,8 @@
</span><span class="cx"> #include <WebCore/SessionID.h>
</span><span class="cx"> #include <memory>
</span><span class="cx"> #include <wtf/Forward.h>
</span><ins>+#include <wtf/Function.h>
</ins><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><del>-#include <wtf/NoncopyableFunction.h>
</del><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx">
</span><span class="cx"> void ensurePrivateBrowsingSession(WebCore::SessionID);
</span><span class="cx">
</span><del>- void grantSandboxExtensionsToDatabaseProcessForBlobs(const Vector<String>& filenames, NoncopyableFunction<void ()>&& completionHandler);
</del><ins>+ void grantSandboxExtensionsToDatabaseProcessForBlobs(const Vector<String>& filenames, Function<void ()>&& completionHandler);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> NetworkProcess();
</span><span class="lines">@@ -205,7 +205,7 @@
</span><span class="cx"> typedef HashMap<const char*, std::unique_ptr<NetworkProcessSupplement>, PtrHash<const char*>> NetworkProcessSupplementMap;
</span><span class="cx"> NetworkProcessSupplementMap m_supplements;
</span><span class="cx">
</span><del>- HashMap<uint64_t, NoncopyableFunction<void ()>> m_sandboxExtensionForBlobsCompletionHandlers;
</del><ins>+ HashMap<uint64_t, Function<void ()>> m_sandboxExtensionForBlobsCompletionHandlers;
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> void platformInitializeNetworkProcessCocoa(const NetworkProcessCreationParameters&);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -382,7 +382,7 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-std::unique_ptr<Entry> Cache::store(const WebCore::ResourceRequest& request, const WebCore::ResourceResponse& response, RefPtr<WebCore::SharedBuffer>&& responseData, NoncopyableFunction<void (MappedBody&)>&& completionHandler)
</del><ins>+std::unique_ptr<Entry> Cache::store(const WebCore::ResourceRequest& request, const WebCore::ResourceResponse& response, RefPtr<WebCore::SharedBuffer>&& responseData, Function<void (MappedBody&)>&& completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isEnabled());
</span><span class="cx"> ASSERT(responseData);
</span><span class="lines">@@ -480,7 +480,7 @@
</span><span class="cx"> remove(makeCacheKey(request));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Cache::traverse(NoncopyableFunction<void (const TraversalEntry*)>&& traverseHandler)
</del><ins>+void Cache::traverse(Function<void (const TraversalEntry*)>&& traverseHandler)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isEnabled());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> #include "NetworkCacheStorage.h"
</span><span class="cx"> #include "ShareableResource.h"
</span><span class="cx"> #include <WebCore/ResourceResponse.h>
</span><del>-#include <wtf/NoncopyableFunction.h>
</del><ins>+#include <wtf/Function.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx">
</span><span class="cx"> // Completion handler may get called back synchronously on failure.
</span><span class="cx"> void retrieve(const WebCore::ResourceRequest&, const GlobalFrameID&, std::function<void (std::unique_ptr<Entry>)>&&);
</span><del>- std::unique_ptr<Entry> store(const WebCore::ResourceRequest&, const WebCore::ResourceResponse&, RefPtr<WebCore::SharedBuffer>&&, NoncopyableFunction<void (MappedBody&)>&&);
</del><ins>+ std::unique_ptr<Entry> store(const WebCore::ResourceRequest&, const WebCore::ResourceResponse&, RefPtr<WebCore::SharedBuffer>&&, Function<void (MappedBody&)>&&);
</ins><span class="cx"> std::unique_ptr<Entry> storeRedirect(const WebCore::ResourceRequest&, const WebCore::ResourceResponse&, const WebCore::ResourceRequest& redirectRequest);
</span><span class="cx"> std::unique_ptr<Entry> update(const WebCore::ResourceRequest&, const GlobalFrameID&, const Entry&, const WebCore::ResourceResponse& validatingResponse);
</span><span class="cx">
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> const Entry& entry;
</span><span class="cx"> const Storage::RecordInfo& recordInfo;
</span><span class="cx"> };
</span><del>- void traverse(NoncopyableFunction<void (const TraversalEntry*)>&&);
</del><ins>+ void traverse(Function<void (const TraversalEntry*)>&&);
</ins><span class="cx"> void remove(const Key&);
</span><span class="cx"> void remove(const WebCore::ResourceRequest&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheIOChannelSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp 2016-06-24 19:40:19 UTC (rev 202439)
</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<void ()>&& task, WorkQueue* queue)
</del><ins>+static inline void runTaskInQueue(Function<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>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStorageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -34,8 +34,8 @@
</span><span class="cx"> #include <WebCore/Timer.h>
</span><span class="cx"> #include <wtf/BloomFilter.h>
</span><span class="cx"> #include <wtf/Deque.h>
</span><ins>+#include <wtf/Function.h>
</ins><span class="cx"> #include <wtf/HashSet.h>
</span><del>-#include <wtf/NoncopyableFunction.h>
</del><span class="cx"> #include <wtf/Optional.h>
</span><span class="cx"> #include <wtf/WorkQueue.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> typedef std::function<bool (std::unique_ptr<Record>)> RetrieveCompletionHandler;
</span><span class="cx"> void retrieve(const Key&, unsigned priority, RetrieveCompletionHandler&&);
</span><span class="cx">
</span><del>- typedef NoncopyableFunction<void (const Data& mappedBody)> MappedBodyHandler;
</del><ins>+ typedef Function<void (const Data& mappedBody)> MappedBodyHandler;
</ins><span class="cx"> void store(const Record&, MappedBodyHandler&&);
</span><span class="cx">
</span><span class="cx"> void remove(const Key&);
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> ShareCount = 1 << 1,
</span><span class="cx"> };
</span><span class="cx"> typedef unsigned TraverseFlags;
</span><del>- typedef NoncopyableFunction<void (const Record*, const RecordInfo&)> TraverseHandler;
</del><ins>+ typedef Function<void (const Record*, const RecordInfo&)> TraverseHandler;
</ins><span class="cx"> // Null record signals end.
</span><span class="cx"> void traverse(const String& type, TraverseFlags, TraverseHandler&&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessFileAPIBlobRegistryProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.cpp (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.cpp 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.cpp 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> return resultSize;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void BlobRegistryProxy::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, NoncopyableFunction<void (const Vector<String>& filePaths)>&& completionHandler)
</del><ins>+void BlobRegistryProxy::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, Function<void (const Vector<String>& filePaths)>&& completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> WebProcess::singleton().networkConnection()->writeBlobsToTemporaryFiles(blobURLs, WTFMove(completionHandler));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessFileAPIBlobRegistryProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.h (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.h 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.h 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> void unregisterBlobURL(const WebCore::URL&) override;
</span><span class="cx"> void registerBlobURLForSlice(const WebCore::URL&, const WebCore::URL& srcURL, long long start, long long end) override;
</span><span class="cx"> unsigned long long blobSize(const WebCore::URL&) override;
</span><del>- void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, NoncopyableFunction<void (const Vector<String>& filePaths)>&& completionHandler) override;
</del><ins>+ void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, Function<void (const Vector<String>& filePaths)>&& completionHandler) override;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkNetworkProcessConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkProcessConnection::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, NoncopyableFunction<void (const Vector<String>& filePaths)>&& completionHandler)
</del><ins>+void NetworkProcessConnection::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, Function<void (const Vector<String>& filePaths)>&& completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> static uint64_t writeBlobToFileIdentifier;
</span><span class="cx"> uint64_t requestIdentifier = ++writeBlobToFileIdentifier;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkNetworkProcessConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.h (202438 => 202439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.h 2016-06-24 19:26:50 UTC (rev 202438)
+++ trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.h 2016-06-24 19:40:19 UTC (rev 202439)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx">
</span><span class="cx"> void didReceiveNetworkProcessConnectionMessage(IPC::Connection&, IPC::MessageDecoder&);
</span><span class="cx">
</span><del>- void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, NoncopyableFunction<void (const Vector<String>& filePaths)>&& completionHandler);
</del><ins>+ void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, Function<void (const Vector<String>& filePaths)>&& completionHandler);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> NetworkProcessConnection(IPC::Connection::Identifier);
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> // The connection from the web process to the network process.
</span><span class="cx"> RefPtr<IPC::Connection> m_connection;
</span><span class="cx">
</span><del>- HashMap<uint64_t, NoncopyableFunction<void (const Vector<String>&)>> m_writeBlobToFileCompletionHandlers;
</del><ins>+ HashMap<uint64_t, Function<void (const Vector<String>&)>> m_writeBlobToFileCompletionHandlers;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre>
</div>
</div>
</body>
</html>