Diff
Modified: trunk/Source/WebKit2/ChangeLog (218785 => 218786)
--- trunk/Source/WebKit2/ChangeLog 2017-06-24 10:16:41 UTC (rev 218785)
+++ trunk/Source/WebKit2/ChangeLog 2017-06-24 10:24:33 UTC (rev 218786)
@@ -1,3 +1,17 @@
+2017-06-24 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r218785.
+ https://bugs.webkit.org/show_bug.cgi?id=173808
+
+ This change broke the macOS Sierra build (Requested by
+ annulen|home on #webkit).
+
+ Reverted changeset:
+
+ "Removed unused lambda captures from WebKit2"
+ https://bugs.webkit.org/show_bug.cgi?id=173555
+ http://trac.webkit.org/changeset/218785
+
2017-06-24 Konstantin Tokarev <[email protected]>
Removed unused lambda captures from WebKit2
Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp (218785 => 218786)
--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2017-06-24 10:16:41 UTC (rev 218785)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2017-06-24 10:24:33 UTC (rev 218786)
@@ -129,7 +129,7 @@
uint64_t callbackID = generateCallbackID();
RELEASE_LOG_IF(sessionID.isAlwaysOnLoggingAllowed(), ProcessSuspension, "%p - NetworkProcessProxy is taking a background assertion because the Network process is fetching Website data", this);
- m_pendingFetchWebsiteDataCallbacks.add(callbackID, [token = throttler().backgroundActivityToken(), completionHandler = WTFMove(completionHandler)](WebsiteData websiteData) {
+ m_pendingFetchWebsiteDataCallbacks.add(callbackID, [this, token = throttler().backgroundActivityToken(), completionHandler = WTFMove(completionHandler), sessionID](WebsiteData websiteData) {
completionHandler(WTFMove(websiteData));
RELEASE_LOG_IF(sessionID.isAlwaysOnLoggingAllowed(), ProcessSuspension, "%p - NetworkProcessProxy is releasing a background assertion because the Network process is done fetching Website data", this);
});
@@ -142,7 +142,7 @@
auto callbackID = generateCallbackID();
RELEASE_LOG_IF(sessionID.isAlwaysOnLoggingAllowed(), ProcessSuspension, "%p - NetworkProcessProxy is taking a background assertion because the Network process is deleting Website data", this);
- m_pendingDeleteWebsiteDataCallbacks.add(callbackID, [token = throttler().backgroundActivityToken(), completionHandler = WTFMove(completionHandler)] {
+ m_pendingDeleteWebsiteDataCallbacks.add(callbackID, [this, token = throttler().backgroundActivityToken(), completionHandler = WTFMove(completionHandler), sessionID] {
completionHandler();
RELEASE_LOG_IF(sessionID.isAlwaysOnLoggingAllowed(), ProcessSuspension, "%p - NetworkProcessProxy is releasing a background assertion because the Network process is done deleting Website data", this);
});
@@ -156,7 +156,7 @@
uint64_t callbackID = generateCallbackID();
RELEASE_LOG_IF(sessionID.isAlwaysOnLoggingAllowed(), ProcessSuspension, "%p - NetworkProcessProxy is taking a background assertion because the Network process is deleting Website data for several origins", this);
- m_pendingDeleteWebsiteDataForOriginsCallbacks.add(callbackID, [token = throttler().backgroundActivityToken(), completionHandler = WTFMove(completionHandler)] {
+ m_pendingDeleteWebsiteDataForOriginsCallbacks.add(callbackID, [this, token = throttler().backgroundActivityToken(), completionHandler = WTFMove(completionHandler), sessionID] {
completionHandler();
RELEASE_LOG_IF(sessionID.isAlwaysOnLoggingAllowed(), ProcessSuspension, "%p - NetworkProcessProxy is releasing a background assertion because the Network process is done deleting Website data for several origins", this);
});
Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (218785 => 218786)
--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2017-06-24 10:16:41 UTC (rev 218785)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2017-06-24 10:24:33 UTC (rev 218786)
@@ -883,7 +883,7 @@
auto token = throttler().backgroundActivityToken();
RELEASE_LOG_IF(sessionID.isAlwaysOnLoggingAllowed(), ProcessSuspension, "%p - WebProcessProxy is taking a background assertion because the Web process is fetching Website data", this);
- connection()->sendWithReply(Messages::WebProcess::FetchWebsiteData(sessionID, dataTypes), 0, RunLoop::main(), [token, completionHandler = WTFMove(completionHandler)](auto reply) {
+ connection()->sendWithReply(Messages::WebProcess::FetchWebsiteData(sessionID, dataTypes), 0, RunLoop::main(), [this, token, completionHandler = WTFMove(completionHandler), sessionID](auto reply) {
if (!reply) {
completionHandler(WebsiteData { });
return;
@@ -901,7 +901,7 @@
auto token = throttler().backgroundActivityToken();
RELEASE_LOG_IF(sessionID.isAlwaysOnLoggingAllowed(), ProcessSuspension, "%p - WebProcessProxy is taking a background assertion because the Web process is deleting Website data", this);
- connection()->sendWithReply(Messages::WebProcess::DeleteWebsiteData(sessionID, dataTypes, modifiedSince), 0, RunLoop::main(), [token, completionHandler = WTFMove(completionHandler)](auto reply) {
+ connection()->sendWithReply(Messages::WebProcess::DeleteWebsiteData(sessionID, dataTypes, modifiedSince), 0, RunLoop::main(), [this, token, completionHandler = WTFMove(completionHandler), sessionID](auto reply) {
completionHandler();
RELEASE_LOG_IF(sessionID.isAlwaysOnLoggingAllowed(), ProcessSuspension, "%p - WebProcessProxy is releasing a background assertion because the Web process is done deleting Website data", this);
});
@@ -914,7 +914,7 @@
auto token = throttler().backgroundActivityToken();
RELEASE_LOG_IF(sessionID.isAlwaysOnLoggingAllowed(), ProcessSuspension, "%p - WebProcessProxy is taking a background assertion because the Web process is deleting Website data for several origins", this);
- connection()->sendWithReply(Messages::WebProcess::DeleteWebsiteDataForOrigins(sessionID, dataTypes, origins), 0, RunLoop::main(), [token, completionHandler = WTFMove(completionHandler)](auto reply) {
+ connection()->sendWithReply(Messages::WebProcess::DeleteWebsiteDataForOrigins(sessionID, dataTypes, origins), 0, RunLoop::main(), [this, token, completionHandler = WTFMove(completionHandler), sessionID](auto reply) {
completionHandler();
RELEASE_LOG_IF(sessionID.isAlwaysOnLoggingAllowed(), ProcessSuspension, "%p - WebProcessProxy is releasing a background assertion because the Web process is done deleting Website data for several origins", this);
});
Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp (218785 => 218786)
--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2017-06-24 10:16:41 UTC (rev 218785)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2017-06-24 10:24:33 UTC (rev 218786)
@@ -527,7 +527,7 @@
void WebsiteDataStore::topPrivatelyControlledDomainsWithWebsiteData(OptionSet<WebsiteDataType> dataTypes, OptionSet<WebsiteDataFetchOption> fetchOptions, Function<void(HashSet<String>&&)>&& completionHandler)
{
- fetchData(dataTypes, fetchOptions, [completionHandler = WTFMove(completionHandler), protectedThis = makeRef(*this)](auto&& existingDataRecords) {
+ fetchData(dataTypes, fetchOptions, [completionHandler = WTFMove(completionHandler), this, protectedThis = makeRef(*this)](auto&& existingDataRecords) {
HashSet<String> domainsWithDataRecords;
for (auto&& dataRecord : existingDataRecords) {
String domain = dataRecord.topPrivatelyControlledDomain();
