Diff
Modified: trunk/Source/WebKit2/ChangeLog (201693 => 201694)
--- trunk/Source/WebKit2/ChangeLog 2016-06-05 03:46:42 UTC (rev 201693)
+++ trunk/Source/WebKit2/ChangeLog 2016-06-05 14:45:52 UTC (rev 201694)
@@ -1,3 +1,25 @@
+2016-06-05 Brady Eidson <[email protected]>
+
+ Fix the build after r201693.
+ https://bugs.webkit.org/show_bug.cgi?id=158394
+
+ Reviewed by NOBODY (Build fix).
+
+ r201693 landed without the Source/WebKit2 changes, and I didn't have EWS/CQ available to check myself. *sigh*
+
+ * NetworkProcess/FileAPI/NetworkBlobRegistry.cpp:
+ (WebKit::NetworkBlobRegistry::writeBlobsToTemporaryFiles):
+ * NetworkProcess/FileAPI/NetworkBlobRegistry.h:
+
+ * WebProcess/FileAPI/BlobRegistryProxy.cpp:
+ (WebKit::BlobRegistryProxy::writeBlobsToTemporaryFiles):
+ * WebProcess/FileAPI/BlobRegistryProxy.h:
+
+ * WebProcess/Network/NetworkProcessConnection.cpp:
+ (WebKit::NetworkProcessConnection::didClose):
+ (WebKit::NetworkProcessConnection::writeBlobsToTemporaryFiles):
+ * WebProcess/Network/NetworkProcessConnection.h:
+
2016-06-03 Commit Queue <[email protected]>
Unreviewed, rolling out r201663.
Modified: trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp (201693 => 201694)
--- trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp 2016-06-05 03:46:42 UTC (rev 201693)
+++ trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp 2016-06-05 14:45:52 UTC (rev 201694)
@@ -132,9 +132,9 @@
return blobRegistry().blobSize(url);
}
-void NetworkBlobRegistry::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, std::function<void(const Vector<String>&)> completionHandler)
+void NetworkBlobRegistry::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, NoncopyableFunction<void(const Vector<String>&)>&& completionHandler)
{
- blobRegistry().writeBlobsToTemporaryFiles(blobURLs, completionHandler);
+ blobRegistry().writeBlobsToTemporaryFiles(blobURLs, WTFMove(completionHandler));
}
void NetworkBlobRegistry::connectionToWebProcessDidClose(NetworkConnectionToWebProcess* connection)
Modified: trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.h (201693 => 201694)
--- trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.h 2016-06-05 03:46:42 UTC (rev 201693)
+++ trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.h 2016-06-05 14:45:52 UTC (rev 201694)
@@ -30,6 +30,7 @@
#include <functional>
#include <wtf/HashMap.h>
#include <wtf/HashSet.h>
+#include <wtf/NoncopyableFunction.h>
namespace WebCore {
class BlobDataFileReference;
@@ -54,7 +55,7 @@
void registerBlobURLForSlice(NetworkConnectionToWebProcess*, const WebCore::URL&, const WebCore::URL& srcURL, int64_t start, int64_t end);
void unregisterBlobURL(NetworkConnectionToWebProcess*, const WebCore::URL&);
uint64_t blobSize(NetworkConnectionToWebProcess*, const WebCore::URL&);
- void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, std::function<void(const Vector<String>&)> completionHandler);
+ void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, NoncopyableFunction<void(const Vector<String>&)>&& completionHandler);
void connectionToWebProcessDidClose(NetworkConnectionToWebProcess*);
Modified: trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.cpp (201693 => 201694)
--- trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.cpp 2016-06-05 03:46:42 UTC (rev 201693)
+++ trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.cpp 2016-06-05 14:45:52 UTC (rev 201694)
@@ -81,9 +81,9 @@
return resultSize;
}
-void BlobRegistryProxy::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, std::function<void (const Vector<String>& filePaths)> completionHandler)
+void BlobRegistryProxy::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, NoncopyableFunction<void (const Vector<String>& filePaths)>&& completionHandler)
{
- WebProcess::singleton().networkConnection()->writeBlobsToTemporaryFiles(blobURLs, completionHandler);
+ WebProcess::singleton().networkConnection()->writeBlobsToTemporaryFiles(blobURLs, WTFMove(completionHandler));
}
}
Modified: trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.h (201693 => 201694)
--- trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.h 2016-06-05 03:46:42 UTC (rev 201693)
+++ trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.h 2016-06-05 14:45:52 UTC (rev 201694)
@@ -39,7 +39,7 @@
void unregisterBlobURL(const WebCore::URL&) override;
void registerBlobURLForSlice(const WebCore::URL&, const WebCore::URL& srcURL, long long start, long long end) override;
unsigned long long blobSize(const WebCore::URL&) override;
- void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, std::function<void (const Vector<String>& filePaths)> completionHandler) override;
+ void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, NoncopyableFunction<void (const Vector<String>& filePaths)>&& completionHandler) override;
};
}
Modified: trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp (201693 => 201694)
--- trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp 2016-06-05 03:46:42 UTC (rev 201693)
+++ trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp 2016-06-05 14:45:52 UTC (rev 201694)
@@ -75,7 +75,7 @@
WebProcess::singleton().networkProcessConnectionClosed(this);
Vector<String> dummyFilenames;
- for (auto handler : m_writeBlobToFileCompletionHandlers.values())
+ for (auto& handler : m_writeBlobToFileCompletionHandlers.values())
handler(dummyFilenames);
m_writeBlobToFileCompletionHandlers.clear();
@@ -85,12 +85,12 @@
{
}
-void NetworkProcessConnection::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, std::function<void (const Vector<String>& filePaths)> completionHandler)
+void NetworkProcessConnection::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, NoncopyableFunction<void (const Vector<String>& filePaths)>&& completionHandler)
{
static uint64_t writeBlobToFileIdentifier;
uint64_t requestIdentifier = ++writeBlobToFileIdentifier;
- m_writeBlobToFileCompletionHandlers.set(requestIdentifier, completionHandler);
+ m_writeBlobToFileCompletionHandlers.set(requestIdentifier, WTFMove(completionHandler));
WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::WriteBlobsToTemporaryFiles(blobURLs, requestIdentifier), 0);
}
Modified: trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.h (201693 => 201694)
--- trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.h 2016-06-05 03:46:42 UTC (rev 201693)
+++ trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.h 2016-06-05 14:45:52 UTC (rev 201694)
@@ -58,7 +58,7 @@
void didReceiveNetworkProcessConnectionMessage(IPC::Connection&, IPC::MessageDecoder&);
- void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, std::function<void (const Vector<String>& filePaths)> completionHandler);
+ void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, NoncopyableFunction<void (const Vector<String>& filePaths)>&& completionHandler);
private:
NetworkProcessConnection(IPC::Connection::Identifier);
@@ -81,7 +81,7 @@
// The connection from the web process to the network process.
RefPtr<IPC::Connection> m_connection;
- HashMap<uint64_t, std::function<void (const Vector<String>&)>> m_writeBlobToFileCompletionHandlers;
+ HashMap<uint64_t, NoncopyableFunction<void (const Vector<String>&)>> m_writeBlobToFileCompletionHandlers;
};
} // namespace WebKit
