<!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>[201354] 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/201354">201354</a></dd>
<dt>Author</dt> <dd>ryanhaddad@apple.com</dd>
<dt>Date</dt> <dd>2016-05-24 14:38:50 -0700 (Tue, 24 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/201341">r201341</a>.
This change may have caused LayoutTests to crash on Mac and
iOS
Reverted changeset:
"Use lambda capture with initializer instead of StringCapture"
https://bugs.webkit.org/show_bug.cgi?id=158010
http://trac.webkit.org/changeset/201341</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorefileapiAsyncFileStreamcpp">trunk/Source/WebCore/fileapi/AsyncFileStream.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentLoadercpp">trunk/Source/WebCore/loader/DocumentLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderWorkerThreadableLoadercpp">trunk/Source/WebCore/loader/WorkerThreadableLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebVideoFullscreenControllerAVKitmm">trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlCurlDownloadcpp">trunk/Source/WebCore/platform/network/curl/CurlDownload.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerMessagingProxycpp">trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCachecpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheStatisticscpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheStoragecpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIUserContentExtensionStorecpp">trunk/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStorecpp">trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201353 => 201354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-24 21:30:14 UTC (rev 201353)
+++ trunk/Source/WebCore/ChangeLog 2016-05-24 21:38:50 UTC (rev 201354)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-05-24 Ryan Haddad <ryanhaddad@apple.com>
+
+ Unreviewed, rolling out r201341.
+
+ This change may have caused LayoutTests to crash on Mac and
+ iOS
+
+ Reverted changeset:
+
+ "Use lambda capture with initializer instead of StringCapture"
+ https://bugs.webkit.org/show_bug.cgi?id=158010
+ http://trac.webkit.org/changeset/201341
+
</ins><span class="cx"> 2016-05-24 Adam Bergkvist <adam.bergkvist@ericsson.com>
</span><span class="cx">
</span><span class="cx"> WebRTC: RTCIceCandidate: Make attributes readonly (and update constructor arg)
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiAsyncFileStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/AsyncFileStream.cpp (201353 => 201354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/AsyncFileStream.cpp 2016-05-24 21:30:14 UTC (rev 201353)
+++ trunk/Source/WebCore/fileapi/AsyncFileStream.cpp 2016-05-24 21:38:50 UTC (rev 201354)
</span><span class="lines">@@ -138,10 +138,11 @@
</span><span class="cx">
</span><span class="cx"> void AsyncFileStream::getSize(const String& path, double expectedModificationTime)
</span><span class="cx"> {
</span><ins>+ StringCapture capturedPath(path);
</ins><span class="cx"> // FIXME: Explicit return type here and in all the other cases like this below is a workaround for a deficiency
</span><span class="cx"> // in the Windows compiler at the time of this writing. Could remove it if that is resolved.
</span><del>- perform([path = path.isolatedCopy(), expectedModificationTime](FileStream& stream) -> std::function<void(FileStreamClient&)> {
- long long size = stream.getSize(path, expectedModificationTime);
</del><ins>+ perform([capturedPath, expectedModificationTime](FileStream& stream) -> std::function<void(FileStreamClient&)> {
+ long long size = stream.getSize(capturedPath.string(), expectedModificationTime);
</ins><span class="cx"> return [size](FileStreamClient& client) {
</span><span class="cx"> client.didGetSize(size);
</span><span class="cx"> };
</span><span class="lines">@@ -150,9 +151,10 @@
</span><span class="cx">
</span><span class="cx"> void AsyncFileStream::openForRead(const String& path, long long offset, long long length)
</span><span class="cx"> {
</span><ins>+ StringCapture capturedPath(path);
</ins><span class="cx"> // FIXME: Explicit return type here is a workaround for a deficiency in the Windows compiler at the time of this writing.
</span><del>- perform([path = path.isolatedCopy(), offset, length](FileStream& stream) -> std::function<void(FileStreamClient&)> {
- bool success = stream.openForRead(path, offset, length);
</del><ins>+ perform([capturedPath, offset, length](FileStream& stream) -> std::function<void(FileStreamClient&)> {
+ bool success = stream.openForRead(capturedPath.string(), offset, length);
</ins><span class="cx"> return [success](FileStreamClient& client) {
</span><span class="cx"> client.didOpen(success);
</span><span class="cx"> };
</span><span class="lines">@@ -161,8 +163,9 @@
</span><span class="cx">
</span><span class="cx"> void AsyncFileStream::openForWrite(const String& path)
</span><span class="cx"> {
</span><del>- perform([path = path.isolatedCopy()](FileStream& stream) -> std::function<void(FileStreamClient&)> {
- bool success = stream.openForWrite(path);
</del><ins>+ StringCapture capturedPath(path);
+ perform([capturedPath](FileStream& stream) -> std::function<void(FileStreamClient&)> {
+ bool success = stream.openForWrite(capturedPath.string());
</ins><span class="cx"> return [success](FileStreamClient& client) {
</span><span class="cx"> client.didOpen(success);
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (201353 => 201354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2016-05-24 21:30:14 UTC (rev 201353)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2016-05-24 21:38:50 UTC (rev 201354)
</span><span class="lines">@@ -1703,9 +1703,10 @@
</span><span class="cx"> String unblockRequestDeniedScript { contentFilter.unblockRequestDeniedScript() };
</span><span class="cx"> if (!unblockRequestDeniedScript.isEmpty() && frame) {
</span><span class="cx"> static_assert(std::is_base_of<ThreadSafeRefCounted<Frame>, Frame>::value, "Frame must be ThreadSafeRefCounted.");
</span><del>- unblockHandler.wrapWithDecisionHandler([frame, unblockRequestDeniedScript = unblockRequestDeniedScript.isolatedCopy()](bool unblocked) {
</del><ins>+ StringCapture capturedScript { unblockRequestDeniedScript };
+ unblockHandler.wrapWithDecisionHandler([frame, capturedScript](bool unblocked) {
</ins><span class="cx"> if (!unblocked)
</span><del>- frame->script().executeScript(unblockRequestDeniedScript);
</del><ins>+ frame->script().executeScript(capturedScript.string());
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> frameLoader()->client().contentFilterDidBlockLoad(WTFMove(unblockHandler));
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderWorkerThreadableLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/WorkerThreadableLoader.cpp (201353 => 201354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/WorkerThreadableLoader.cpp 2016-05-24 21:30:14 UTC (rev 201353)
+++ trunk/Source/WebCore/loader/WorkerThreadableLoader.cpp 2016-05-24 21:38:50 UTC (rev 201354)
</span><span class="lines">@@ -98,12 +98,13 @@
</span><span class="cx"> auto* contentSecurityPolicyCopy = std::make_unique<ContentSecurityPolicy>(*securityOrigin).release();
</span><span class="cx"> contentSecurityPolicyCopy->copyStateFrom(contentSecurityPolicy);
</span><span class="cx">
</span><del>- m_loaderProxy.postTaskToLoader([this, requestData, optionsCopy, contentSecurityPolicyCopy, outgoingReferrer = outgoingReferrer.isolatedCopy()](ScriptExecutionContext& context) {
</del><ins>+ StringCapture capturedOutgoingReferrer(outgoingReferrer);
+ m_loaderProxy.postTaskToLoader([this, requestData, optionsCopy, contentSecurityPolicyCopy, capturedOutgoingReferrer](ScriptExecutionContext& context) {
</ins><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> Document& document = downcast<Document>(context);
</span><span class="cx">
</span><span class="cx"> auto request = ResourceRequest::adopt(std::unique_ptr<CrossThreadResourceRequestData>(requestData));
</span><del>- request->setHTTPReferrer(outgoingReferrer);
</del><ins>+ request->setHTTPReferrer(capturedOutgoingReferrer.string());
</ins><span class="cx">
</span><span class="cx"> auto options = std::unique_ptr<ThreadableLoaderOptions>(optionsCopy);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebVideoFullscreenControllerAVKitmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm (201353 => 201354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2016-05-24 21:30:14 UTC (rev 201353)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2016-05-24 21:38:50 UTC (rev 201354)
</span><span class="lines">@@ -430,9 +430,10 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(WebThreadIsCurrent());
</span><span class="cx"> RefPtr<WebVideoFullscreenControllerContext> protectedThis(this);
</span><del>- dispatch_async(dispatch_get_main_queue(), [protectedThis, this, enabled, type, localizedDeviceName = localizedDeviceName.isolatedCopy()] {
</del><ins>+ StringCapture capturedLocalizedDeviceName(localizedDeviceName);
+ dispatch_async(dispatch_get_main_queue(), [protectedThis, this, enabled, type, capturedLocalizedDeviceName] {
</ins><span class="cx"> if (m_interface)
</span><del>- m_interface->setExternalPlayback(enabled, type, localizedDeviceName);
</del><ins>+ m_interface->setExternalPlayback(enabled, type, capturedLocalizedDeviceName.string());
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlCurlDownloadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/CurlDownload.cpp (201353 => 201354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/CurlDownload.cpp 2016-05-24 21:30:14 UTC (rev 201353)
+++ trunk/Source/WebCore/platform/network/curl/CurlDownload.cpp 2016-05-24 21:38:50 UTC (rev 201354)
</span><span class="lines">@@ -414,12 +414,14 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><ins>+ StringCapture capturedHeader(header);
+
</ins><span class="cx"> RefPtr<CurlDownload> protectedThis(this);
</span><span class="cx">
</span><del>- callOnMainThread([this, header = header.isolatedCopy(), protectedThis] {
- int splitPos = header.find(":");
</del><ins>+ callOnMainThread([this, capturedHeader, protectedThis] {
+ int splitPos = capturedHeader.string().find(":");
</ins><span class="cx"> if (splitPos != -1)
</span><del>- m_response.setHTTPHeaderField(header.left(splitPos), header.substring(splitPos + 1).stripWhiteSpace());
</del><ins>+ m_response.setHTTPHeaderField(capturedHeader.string().left(splitPos), capturedHeader.string().substring(splitPos + 1).stripWhiteSpace());
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerMessagingProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp (201353 => 201354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp 2016-05-24 21:30:14 UTC (rev 201353)
+++ trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp 2016-05-24 21:38:50 UTC (rev 201354)
</span><span class="lines">@@ -141,7 +141,9 @@
</span><span class="cx">
</span><span class="cx"> void WorkerMessagingProxy::postExceptionToWorkerObject(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL)
</span><span class="cx"> {
</span><del>- m_scriptExecutionContext->postTask([this, errorMessage = errorMessage.isolatedCopy(), sourceURL = sourceURL.isolatedCopy(), lineNumber, columnNumber] (ScriptExecutionContext& context) {
</del><ins>+ StringCapture capturedErrorMessage(errorMessage);
+ StringCapture capturedSourceURL(sourceURL);
+ m_scriptExecutionContext->postTask([this, capturedErrorMessage, capturedSourceURL, lineNumber, columnNumber] (ScriptExecutionContext& context) {
</ins><span class="cx"> Worker* workerObject = this->workerObject();
</span><span class="cx"> if (!workerObject)
</span><span class="cx"> return;
</span><span class="lines">@@ -149,18 +151,20 @@
</span><span class="cx"> // We don't bother checking the askedToTerminate() flag here, because exceptions should *always* be reported even if the thread is terminated.
</span><span class="cx"> // This is intentionally different than the behavior in MessageWorkerTask, because terminated workers no longer deliver messages (section 4.6 of the WebWorker spec), but they do report exceptions.
</span><span class="cx">
</span><del>- bool errorHandled = !workerObject->dispatchEvent(ErrorEvent::create(errorMessage, sourceURL, lineNumber, columnNumber));
</del><ins>+ bool errorHandled = !workerObject->dispatchEvent(ErrorEvent::create(capturedErrorMessage.string(), capturedSourceURL.string(), lineNumber, columnNumber));
</ins><span class="cx"> if (!errorHandled)
</span><del>- context.reportException(errorMessage, lineNumber, columnNumber, sourceURL, 0);
</del><ins>+ context.reportException(capturedErrorMessage.string(), lineNumber, columnNumber, capturedSourceURL.string(), 0);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerMessagingProxy::postConsoleMessageToWorkerObject(MessageSource source, MessageLevel level, const String& message, int lineNumber, int columnNumber, const String& sourceURL)
</span><span class="cx"> {
</span><del>- m_scriptExecutionContext->postTask([this, source, level, message = message.isolatedCopy(), sourceURL = sourceURL.isolatedCopy(), lineNumber, columnNumber] (ScriptExecutionContext& context) {
</del><ins>+ StringCapture capturedMessage(message);
+ StringCapture capturedSourceURL(sourceURL);
+ m_scriptExecutionContext->postTask([this, source, level, capturedMessage, capturedSourceURL, lineNumber, columnNumber] (ScriptExecutionContext& context) {
</ins><span class="cx"> if (askedToTerminate())
</span><span class="cx"> return;
</span><del>- context.addConsoleMessage(source, level, message, sourceURL, lineNumber, columnNumber);
</del><ins>+ context.addConsoleMessage(source, level, capturedMessage.string(), capturedSourceURL.string(), lineNumber, columnNumber);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (201353 => 201354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-05-24 21:30:14 UTC (rev 201353)
+++ trunk/Source/WebKit2/ChangeLog 2016-05-24 21:38:50 UTC (rev 201354)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-05-24 Ryan Haddad <ryanhaddad@apple.com>
+
+ Unreviewed, rolling out r201341.
+
+ This change may have caused LayoutTests to crash on Mac and
+ iOS
+
+ Reverted changeset:
+
+ "Use lambda capture with initializer instead of StringCapture"
+ https://bugs.webkit.org/show_bug.cgi?id=158010
+ http://trac.webkit.org/changeset/201341
+
</ins><span class="cx"> 2016-05-24 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix null pointer dereferencing in WebViewImpl::inputContext
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp (201353 => 201354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2016-05-24 21:30:14 UTC (rev 201353)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2016-05-24 21:38:50 UTC (rev 201354)
</span><span class="lines">@@ -618,8 +618,9 @@
</span><span class="cx"> void Cache::deleteDumpFile()
</span><span class="cx"> {
</span><span class="cx"> auto queue = WorkQueue::create("com.apple.WebKit.Cache.delete");
</span><del>- queue->dispatch([filePath = dumpFilePath().isolatedCopy()] {
- WebCore::deleteFile(filePath);
</del><ins>+ StringCapture dumpFilePathCapture(dumpFilePath());
+ queue->dispatch([dumpFilePathCapture] {
+ WebCore::deleteFile(dumpFilePathCapture.string());
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStatisticscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.cpp (201353 => 201354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.cpp 2016-05-24 21:30:14 UTC (rev 201353)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.cpp 2016-05-24 21:38:50 UTC (rev 201354)
</span><span class="lines">@@ -93,9 +93,13 @@
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><span class="cx">
</span><span class="cx"> auto startTime = std::chrono::system_clock::now();
</span><del>- serialBackgroundIOQueue().dispatch([this, databasePath = databasePath.isolatedCopy(), networkCachePath = singleton().recordsPath().isolatedCopy(), startTime] {
</del><ins>+
+ StringCapture databasePathCapture(databasePath);
+ StringCapture networkCachePathCapture(singleton().recordsPath());
+ serialBackgroundIOQueue().dispatch([this, databasePathCapture, networkCachePathCapture, startTime] {
</ins><span class="cx"> WebCore::SQLiteTransactionInProgressAutoCounter transactionCounter;
</span><span class="cx">
</span><ins>+ String databasePath = databasePathCapture.string();
</ins><span class="cx"> if (!WebCore::makeAllDirectories(WebCore::directoryName(databasePath)))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -124,7 +128,7 @@
</span><span class="cx"> LOG(NetworkCache, "(NetworkProcess) Network cache statistics database load complete, entries=%lu time=%" PRIi64 "ms", static_cast<size_t>(m_approximateEntryCount), elapsedMS);
</span><span class="cx">
</span><span class="cx"> if (!m_approximateEntryCount) {
</span><del>- bootstrapFromNetworkCache(networkCachePath);
</del><ins>+ bootstrapFromNetworkCache(networkCachePathCapture.string());
</ins><span class="cx"> #if !LOG_DISABLED
</span><span class="cx"> elapsedMS = static_cast<int64_t>(std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now() - startTime).count());
</span><span class="cx"> #endif
</span><span class="lines">@@ -172,8 +176,9 @@
</span><span class="cx">
</span><span class="cx"> clear();
</span><span class="cx">
</span><del>- serialBackgroundIOQueue().dispatch([this, networkCachePath = singleton().recordsPath().isolatedCopy()] {
- bootstrapFromNetworkCache(networkCachePath);
</del><ins>+ StringCapture networkCachePathCapture(singleton().recordsPath());
+ serialBackgroundIOQueue().dispatch([this, networkCachePathCapture] {
+ bootstrapFromNetworkCache(networkCachePathCapture.string());
</ins><span class="cx"> LOG(NetworkCache, "(NetworkProcess) statistics cache shrink completed m_approximateEntryCount=%lu", static_cast<size_t>(m_approximateEntryCount));
</span><span class="cx"> });
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStoragecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp (201353 => 201354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp 2016-05-24 21:30:14 UTC (rev 201353)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp 2016-05-24 21:38:50 UTC (rev 201354)
</span><span class="lines">@@ -558,8 +558,9 @@
</span><span class="cx">
</span><span class="cx"> void Storage::updateFileModificationTime(const String& path)
</span><span class="cx"> {
</span><del>- serialBackgroundIOQueue().dispatch([path = path.isolatedCopy()] {
- updateFileModificationTimeIfNeeded(path);
</del><ins>+ StringCapture filePathCapture(path);
+ serialBackgroundIOQueue().dispatch([filePathCapture] {
+ updateFileModificationTimeIfNeeded(filePathCapture.string());
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -896,9 +897,13 @@
</span><span class="cx"> if (m_blobFilter)
</span><span class="cx"> m_blobFilter->clear();
</span><span class="cx"> m_approximateRecordsSize = 0;
</span><del>- ioQueue().dispatch([this, modifiedSinceTime, completionHandler = WTFMove(completionHandler), type = type.isolatedCopy()] () mutable {
</del><ins>+
+ // Avoid non-thread safe std::function copies.
+ auto* completionHandlerPtr = completionHandler ? new std::function<void ()>(WTFMove(completionHandler)) : nullptr;
+ StringCapture typeCapture(type);
+ ioQueue().dispatch([this, modifiedSinceTime, completionHandlerPtr, typeCapture] {
</ins><span class="cx"> auto recordsPath = this->recordsPath();
</span><del>- traverseRecordsFiles(recordsPath, type, [modifiedSinceTime](const String& fileName, const String& hashString, const String& type, bool isBlob, const String& recordDirectoryPath) {
</del><ins>+ traverseRecordsFiles(recordsPath, typeCapture.string(), [modifiedSinceTime](const String& fileName, const String& hashString, const String& type, bool isBlob, const String& recordDirectoryPath) {
</ins><span class="cx"> auto filePath = WebCore::pathByAppendingComponent(recordDirectoryPath, fileName);
</span><span class="cx"> if (modifiedSinceTime > std::chrono::system_clock::time_point::min()) {
</span><span class="cx"> auto times = fileTimes(filePath);
</span><span class="lines">@@ -913,9 +918,10 @@
</span><span class="cx"> // This cleans unreferenced blobs.
</span><span class="cx"> m_blobStorage.synchronize();
</span><span class="cx">
</span><del>- if (completionHandler) {
- RunLoop::main().dispatch([completionHandler = WTFMove(completionHandler)] {
- completionHandler();
</del><ins>+ if (completionHandlerPtr) {
+ RunLoop::main().dispatch([completionHandlerPtr] {
+ (*completionHandlerPtr)();
+ delete completionHandlerPtr;
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIUserContentExtensionStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.cpp (201353 => 201354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.cpp 2016-05-24 21:30:14 UTC (rev 201353)
+++ trunk/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.cpp 2016-05-24 21:38:50 UTC (rev 201354)
</span><span class="lines">@@ -307,8 +307,11 @@
</span><span class="cx"> void UserContentExtensionStore::lookupContentExtension(const WTF::String& identifier, std::function<void(RefPtr<API::UserContentExtension>, std::error_code)> completionHandler)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<UserContentExtensionStore> self(this);
</span><del>- m_readQueue->dispatch([self, identifier = identifier.isolatedCopy(), storePath = m_storePath.isolatedCopy(), completionHandler] {
- auto path = constructedPath(storePath, identifier);
</del><ins>+ StringCapture identifierCapture(identifier);
+ StringCapture pathCapture(m_storePath);
+
+ m_readQueue->dispatch([self, identifierCapture, pathCapture, completionHandler] {
+ auto path = constructedPath(pathCapture.string(), identifierCapture.string());
</ins><span class="cx">
</span><span class="cx"> ContentExtensionMetaData metaData;
</span><span class="cx"> Data fileData;
</span><span class="lines">@@ -326,8 +329,8 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RunLoop::main().dispatch([self, identifier = identifier.isolatedCopy(), fileData, metaData, completionHandler] {
- RefPtr<API::UserContentExtension> userContentExtension = createExtension(identifier, metaData, fileData);
</del><ins>+ RunLoop::main().dispatch([self, identifierCapture, fileData, metaData, completionHandler] {
+ RefPtr<API::UserContentExtension> userContentExtension = createExtension(identifierCapture.string(), metaData, fileData);
</ins><span class="cx"> completionHandler(userContentExtension, { });
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="lines">@@ -336,12 +339,16 @@
</span><span class="cx"> void UserContentExtensionStore::compileContentExtension(const WTF::String& identifier, WTF::String&& json, std::function<void(RefPtr<API::UserContentExtension>, std::error_code)> completionHandler)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<UserContentExtensionStore> self(this);
</span><del>- m_compileQueue->dispatch([self, identifier = identifier.isolatedCopy(), json = json.isolatedCopy(), storePath = m_storePath.isolatedCopy(), completionHandler] () mutable {
- auto path = constructedPath(storePath, identifier);
</del><ins>+ StringCapture identifierCapture(identifier);
+ StringCapture jsonCapture(WTFMove(json));
+ StringCapture pathCapture(m_storePath);
</ins><span class="cx">
</span><ins>+ m_compileQueue->dispatch([self, identifierCapture, jsonCapture, pathCapture, completionHandler] () mutable {
+ auto path = constructedPath(pathCapture.string(), identifierCapture.string());
+
</ins><span class="cx"> ContentExtensionMetaData metaData;
</span><span class="cx"> Data fileData;
</span><del>- auto error = compiledToFile(WTFMove(json), path, metaData, fileData);
</del><ins>+ auto error = compiledToFile(jsonCapture.releaseString(), path, metaData, fileData);
</ins><span class="cx"> if (error) {
</span><span class="cx"> RunLoop::main().dispatch([self, error, completionHandler] {
</span><span class="cx"> completionHandler(nullptr, error);
</span><span class="lines">@@ -349,8 +356,8 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RunLoop::main().dispatch([self, identifier = identifier.isolatedCopy(), fileData, metaData, completionHandler] {
- RefPtr<API::UserContentExtension> userContentExtension = createExtension(identifier, metaData, fileData);
</del><ins>+ RunLoop::main().dispatch([self, identifierCapture, fileData, metaData, completionHandler] {
+ RefPtr<API::UserContentExtension> userContentExtension = createExtension(identifierCapture.string(), metaData, fileData);
</ins><span class="cx"> completionHandler(userContentExtension, { });
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="lines">@@ -359,9 +366,12 @@
</span><span class="cx"> void UserContentExtensionStore::removeContentExtension(const WTF::String& identifier, std::function<void(std::error_code)> completionHandler)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<UserContentExtensionStore> self(this);
</span><del>- m_removeQueue->dispatch([self, identifier = identifier.isolatedCopy(), storePath = m_storePath.isolatedCopy(), completionHandler] {
- auto path = constructedPath(storePath, identifier);
</del><ins>+ StringCapture identifierCapture(identifier);
+ StringCapture pathCapture(m_storePath);
</ins><span class="cx">
</span><ins>+ m_removeQueue->dispatch([self, identifierCapture, pathCapture, completionHandler] {
+ auto path = constructedPath(pathCapture.string(), identifierCapture.string());
+
</ins><span class="cx"> if (!WebCore::deleteFile(path)) {
</span><span class="cx"> RunLoop::main().dispatch([self, completionHandler] {
</span><span class="cx"> completionHandler(Error::RemoveFailed);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp (201353 => 201354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2016-05-24 21:30:14 UTC (rev 201353)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2016-05-24 21:38:50 UTC (rev 201354)
</span><span class="lines">@@ -258,11 +258,13 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<CallbackAggregator> callbackAggregator = adoptRef(new CallbackAggregator(fetchOptions, WTFMove(completionHandler)));
</span><span class="cx">
</span><ins>+ if (dataTypes.contains(WebsiteDataType::DiskCache)) {
+ StringCapture mediaCacheDirectory { m_mediaCacheDirectory };
+
</ins><span class="cx"> #if ENABLE(VIDEO)
</span><del>- if (dataTypes.contains(WebsiteDataType::DiskCache)) {
</del><span class="cx"> callbackAggregator->addPendingCallback();
</span><del>- m_queue->dispatch([fetchOptions, mediaCacheDirectory = m_mediaCacheDirectory.isolatedCopy(), callbackAggregator] {
- HashSet<RefPtr<WebCore::SecurityOrigin>> origins = WebCore::HTMLMediaElement::originsInMediaCache(mediaCacheDirectory);
</del><ins>+ m_queue->dispatch([fetchOptions, mediaCacheDirectory, callbackAggregator] {
+ HashSet<RefPtr<WebCore::SecurityOrigin>> origins = WebCore::HTMLMediaElement::originsInMediaCache(mediaCacheDirectory.string());
</ins><span class="cx"> WebsiteData* websiteData = new WebsiteData;
</span><span class="cx">
</span><span class="cx"> for (auto& origin : origins) {
</span><span class="lines">@@ -276,8 +278,8 @@
</span><span class="cx"> delete websiteData;
</span><span class="cx"> });
</span><span class="cx"> });
</span><ins>+#endif
</ins><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> auto networkProcessAccessType = computeNetworkProcessAccessTypeForDataFetch(dataTypes, !isPersistent());
</span><span class="cx"> if (networkProcessAccessType != ProcessAccessType::None) {
</span><span class="lines">@@ -355,10 +357,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (dataTypes.contains(WebsiteDataType::OfflineWebApplicationCache) && isPersistent()) {
</span><ins>+ StringCapture applicationCacheDirectory { m_applicationCacheDirectory };
+ StringCapture applicationCacheFlatFileSubdirectoryName { m_applicationCacheFlatFileSubdirectoryName };
+
</ins><span class="cx"> callbackAggregator->addPendingCallback();
</span><span class="cx">
</span><del>- m_queue->dispatch([fetchOptions, applicationCacheDirectory = m_applicationCacheDirectory.isolatedCopy(), applicationCacheFlatFileSubdirectoryName = m_applicationCacheFlatFileSubdirectoryName.isolatedCopy(), callbackAggregator] {
- auto storage = WebCore::ApplicationCacheStorage::create(applicationCacheDirectory, applicationCacheFlatFileSubdirectoryName);
</del><ins>+ m_queue->dispatch([fetchOptions, applicationCacheDirectory, applicationCacheFlatFileSubdirectoryName, callbackAggregator] {
+ auto storage = WebCore::ApplicationCacheStorage::create(applicationCacheDirectory.string(), applicationCacheFlatFileSubdirectoryName.string());
</ins><span class="cx">
</span><span class="cx"> WebsiteData* websiteData = new WebsiteData;
</span><span class="cx">
</span><span class="lines">@@ -381,11 +386,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (dataTypes.contains(WebsiteDataType::WebSQLDatabases) && isPersistent()) {
</span><ins>+ StringCapture webSQLDatabaseDirectory { m_webSQLDatabaseDirectory };
+
</ins><span class="cx"> callbackAggregator->addPendingCallback();
</span><span class="cx">
</span><del>- m_queue->dispatch([webSQLDatabaseDirectory = m_webSQLDatabaseDirectory.isolatedCopy(), callbackAggregator] {
</del><ins>+ m_queue->dispatch([webSQLDatabaseDirectory, callbackAggregator] {
</ins><span class="cx"> Vector<RefPtr<WebCore::SecurityOrigin>> origins;
</span><del>- WebCore::DatabaseTracker::trackerWithDatabasePath(webSQLDatabaseDirectory)->origins(origins);
</del><ins>+ WebCore::DatabaseTracker::trackerWithDatabasePath(webSQLDatabaseDirectory.string())->origins(origins);
</ins><span class="cx">
</span><span class="cx"> RunLoop::main().dispatch([callbackAggregator, origins]() mutable {
</span><span class="cx"> WebsiteData websiteData;
</span><span class="lines">@@ -411,10 +418,12 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (dataTypes.contains(WebsiteDataType::MediaKeys) && isPersistent()) {
</span><ins>+ StringCapture mediaKeysStorageDirectory { m_mediaKeysStorageDirectory };
+
</ins><span class="cx"> callbackAggregator->addPendingCallback();
</span><span class="cx">
</span><del>- m_queue->dispatch([mediaKeysStorageDirectory = m_mediaKeysStorageDirectory.isolatedCopy(), callbackAggregator] {
- auto origins = mediaKeyOrigins(mediaKeysStorageDirectory);
</del><ins>+ m_queue->dispatch([mediaKeysStorageDirectory, callbackAggregator] {
+ auto origins = mediaKeyOrigins(mediaKeysStorageDirectory.string());
</ins><span class="cx">
</span><span class="cx"> RunLoop::main().dispatch([callbackAggregator, origins]() mutable {
</span><span class="cx"> WebsiteData websiteData;
</span><span class="lines">@@ -547,18 +556,20 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<CallbackAggregator> callbackAggregator = adoptRef(new CallbackAggregator(WTFMove(completionHandler)));
</span><span class="cx">
</span><ins>+ if (dataTypes.contains(WebsiteDataType::DiskCache)) {
+ StringCapture mediaCacheDirectory { m_mediaCacheDirectory };
+
</ins><span class="cx"> #if ENABLE(VIDEO)
</span><del>- if (dataTypes.contains(WebsiteDataType::DiskCache)) {
</del><span class="cx"> callbackAggregator->addPendingCallback();
</span><del>- m_queue->dispatch([modifiedSince, mediaCacheDirectory = m_mediaCacheDirectory.isolatedCopy(), callbackAggregator] {
- WebCore::HTMLMediaElement::clearMediaCache(mediaCacheDirectory, modifiedSince);
</del><ins>+ m_queue->dispatch([modifiedSince, mediaCacheDirectory, callbackAggregator] {
+ WebCore::HTMLMediaElement::clearMediaCache(mediaCacheDirectory.string(), modifiedSince);
</ins><span class="cx">
</span><span class="cx"> WTF::RunLoop::main().dispatch([callbackAggregator] {
</span><span class="cx"> callbackAggregator->removePendingCallback();
</span><span class="cx"> });
</span><span class="cx"> });
</span><ins>+#endif
</ins><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> auto networkProcessAccessType = computeNetworkProcessAccessTypeForDataRemoval(dataTypes, !isPersistent());
</span><span class="cx"> if (networkProcessAccessType != ProcessAccessType::None) {
</span><span class="lines">@@ -626,10 +637,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (dataTypes.contains(WebsiteDataType::OfflineWebApplicationCache) && isPersistent()) {
</span><ins>+ StringCapture applicationCacheDirectory { m_applicationCacheDirectory };
+ StringCapture applicationCacheFlatFileSubdirectoryName { m_applicationCacheFlatFileSubdirectoryName };
+
</ins><span class="cx"> callbackAggregator->addPendingCallback();
</span><span class="cx">
</span><del>- m_queue->dispatch([applicationCacheDirectory = m_applicationCacheDirectory.isolatedCopy(), applicationCacheFlatFileSubdirectoryName = m_applicationCacheFlatFileSubdirectoryName.isolatedCopy(), callbackAggregator] {
- auto storage = WebCore::ApplicationCacheStorage::create(applicationCacheDirectory, applicationCacheFlatFileSubdirectoryName);
</del><ins>+ m_queue->dispatch([applicationCacheDirectory, applicationCacheFlatFileSubdirectoryName, callbackAggregator] {
+ auto storage = WebCore::ApplicationCacheStorage::create(applicationCacheDirectory.string(), applicationCacheFlatFileSubdirectoryName.string());
</ins><span class="cx">
</span><span class="cx"> storage->deleteAllCaches();
</span><span class="cx">
</span><span class="lines">@@ -640,10 +654,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (dataTypes.contains(WebsiteDataType::WebSQLDatabases) && isPersistent()) {
</span><ins>+ StringCapture webSQLDatabaseDirectory { m_webSQLDatabaseDirectory };
+
</ins><span class="cx"> callbackAggregator->addPendingCallback();
</span><span class="cx">
</span><del>- m_queue->dispatch([webSQLDatabaseDirectory = m_webSQLDatabaseDirectory.isolatedCopy(), callbackAggregator, modifiedSince] {
- WebCore::DatabaseTracker::trackerWithDatabasePath(webSQLDatabaseDirectory)->deleteDatabasesModifiedSince(modifiedSince);
</del><ins>+ m_queue->dispatch([webSQLDatabaseDirectory, callbackAggregator, modifiedSince] {
+ WebCore::DatabaseTracker::trackerWithDatabasePath(webSQLDatabaseDirectory.string())->deleteDatabasesModifiedSince(modifiedSince);
</ins><span class="cx">
</span><span class="cx"> RunLoop::main().dispatch([callbackAggregator] {
</span><span class="cx"> callbackAggregator->removePendingCallback();
</span><span class="lines">@@ -665,10 +681,12 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (dataTypes.contains(WebsiteDataType::MediaKeys) && isPersistent()) {
</span><ins>+ StringCapture mediaKeysStorageDirectory { m_mediaKeysStorageDirectory };
+
</ins><span class="cx"> callbackAggregator->addPendingCallback();
</span><span class="cx">
</span><del>- m_queue->dispatch([mediaKeysStorageDirectory = m_mediaKeysStorageDirectory.isolatedCopy(), callbackAggregator, modifiedSince] {
- removeMediaKeys(mediaKeysStorageDirectory, modifiedSince);
</del><ins>+ m_queue->dispatch([mediaKeysStorageDirectory, callbackAggregator, modifiedSince] {
+ removeMediaKeys(mediaKeysStorageDirectory.string(), modifiedSince);
</ins><span class="cx">
</span><span class="cx"> RunLoop::main().dispatch([callbackAggregator] {
</span><span class="cx"> callbackAggregator->removePendingCallback();
</span><span class="lines">@@ -781,24 +799,25 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<CallbackAggregator> callbackAggregator = adoptRef(new CallbackAggregator(WTFMove(completionHandler)));
</span><span class="cx">
</span><del>-#if ENABLE(VIDEO)
</del><span class="cx"> if (dataTypes.contains(WebsiteDataType::DiskCache)) {
</span><ins>+ StringCapture mediaCacheDirectory { m_mediaCacheDirectory };
</ins><span class="cx"> HashSet<RefPtr<WebCore::SecurityOrigin>> origins;
</span><span class="cx"> for (const auto& dataRecord : dataRecords) {
</span><span class="cx"> for (const auto& origin : dataRecord.origins)
</span><span class="cx"> origins.add(origin);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(VIDEO)
</ins><span class="cx"> callbackAggregator->addPendingCallback();
</span><del>- m_queue->dispatch([origins, mediaCacheDirectory = m_mediaCacheDirectory.isolatedCopy(), callbackAggregator] {
- WebCore::HTMLMediaElement::clearMediaCacheForOrigins(mediaCacheDirectory, origins);
</del><ins>+ m_queue->dispatch([origins, mediaCacheDirectory, callbackAggregator] {
+ WebCore::HTMLMediaElement::clearMediaCacheForOrigins(mediaCacheDirectory.string(), origins);
</ins><span class="cx">
</span><span class="cx"> WTF::RunLoop::main().dispatch([callbackAggregator] {
</span><span class="cx"> callbackAggregator->removePendingCallback();
</span><span class="cx"> });
</span><span class="cx"> });
</span><ins>+#endif
</ins><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> auto networkProcessAccessType = computeNetworkProcessAccessTypeForDataRemoval(dataTypes, !isPersistent());
</span><span class="cx"> if (networkProcessAccessType != ProcessAccessType::None) {
</span><span class="lines">@@ -873,6 +892,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (dataTypes.contains(WebsiteDataType::OfflineWebApplicationCache) && isPersistent()) {
</span><ins>+ StringCapture applicationCacheDirectory { m_applicationCacheDirectory };
+ StringCapture applicationCacheFlatFileSubdirectoryName { m_applicationCacheFlatFileSubdirectoryName };
+
</ins><span class="cx"> HashSet<RefPtr<WebCore::SecurityOrigin>> origins;
</span><span class="cx"> for (const auto& dataRecord : dataRecords) {
</span><span class="cx"> for (const auto& origin : dataRecord.origins)
</span><span class="lines">@@ -880,8 +902,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> callbackAggregator->addPendingCallback();
</span><del>- m_queue->dispatch([origins, applicationCacheDirectory = m_applicationCacheDirectory.isolatedCopy(), applicationCacheFlatFileSubdirectoryName = m_applicationCacheFlatFileSubdirectoryName.isolatedCopy(), callbackAggregator] {
- auto storage = WebCore::ApplicationCacheStorage::create(applicationCacheDirectory, applicationCacheFlatFileSubdirectoryName);
</del><ins>+ m_queue->dispatch([origins, applicationCacheDirectory, applicationCacheFlatFileSubdirectoryName, callbackAggregator] {
+ auto storage = WebCore::ApplicationCacheStorage::create(applicationCacheDirectory.string(), applicationCacheFlatFileSubdirectoryName.string());
</ins><span class="cx">
</span><span class="cx"> for (const auto& origin : origins)
</span><span class="cx"> storage->deleteCacheForOrigin(*origin);
</span><span class="lines">@@ -893,6 +915,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (dataTypes.contains(WebsiteDataType::WebSQLDatabases) && isPersistent()) {
</span><ins>+ StringCapture webSQLDatabaseDirectory { m_webSQLDatabaseDirectory };
+
</ins><span class="cx"> HashSet<RefPtr<WebCore::SecurityOrigin>> origins;
</span><span class="cx"> for (const auto& dataRecord : dataRecords) {
</span><span class="cx"> for (const auto& origin : dataRecord.origins)
</span><span class="lines">@@ -900,8 +924,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> callbackAggregator->addPendingCallback();
</span><del>- m_queue->dispatch([origins, callbackAggregator, webSQLDatabaseDirectory = m_webSQLDatabaseDirectory.isolatedCopy()] {
- auto databaseTracker = WebCore::DatabaseTracker::trackerWithDatabasePath(webSQLDatabaseDirectory);
</del><ins>+ m_queue->dispatch([origins, callbackAggregator, webSQLDatabaseDirectory] {
+ auto databaseTracker = WebCore::DatabaseTracker::trackerWithDatabasePath(webSQLDatabaseDirectory.string());
</ins><span class="cx">
</span><span class="cx"> for (const auto& origin : origins)
</span><span class="cx"> databaseTracker->deleteOrigin(origin.get());
</span><span class="lines">@@ -926,6 +950,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (dataTypes.contains(WebsiteDataType::MediaKeys) && isPersistent()) {
</span><ins>+ StringCapture mediaKeysStorageDirectory { m_mediaKeysStorageDirectory };
</ins><span class="cx"> HashSet<RefPtr<WebCore::SecurityOrigin>> origins;
</span><span class="cx"> for (const auto& dataRecord : dataRecords) {
</span><span class="cx"> for (const auto& origin : dataRecord.origins)
</span><span class="lines">@@ -933,9 +958,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> callbackAggregator->addPendingCallback();
</span><del>- m_queue->dispatch([mediaKeysStorageDirectory = m_mediaKeysStorageDirectory.isolatedCopy(), callbackAggregator, origins] {
</del><ins>+ m_queue->dispatch([mediaKeysStorageDirectory, callbackAggregator, origins] {
</ins><span class="cx">
</span><del>- removeMediaKeys(mediaKeysStorageDirectory, origins);
</del><ins>+ removeMediaKeys(mediaKeysStorageDirectory.string(), origins);
</ins><span class="cx">
</span><span class="cx"> RunLoop::main().dispatch([callbackAggregator] {
</span><span class="cx"> callbackAggregator->removePendingCallback();
</span></span></pre>
</div>
</div>
</body>
</html>