Changeset 201695 in webkit

Timestamp:

Jun 5, 2016 7:53:28 AM (8 years ago)

Author:

beidson@apple.com

Message:

Unreviewed, rolling out r201694.

201693

Reverted changeset:

"Fix the build after r201693."
​https://bugs.webkit.org/show_bug.cgi?id=158394
​http://trac.webkit.org/changeset/201694

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/FileAPI/NetworkBlobRegistry.cpp (modified) (1 diff)
• NetworkProcess/FileAPI/NetworkBlobRegistry.h (modified) (2 diffs)
• WebProcess/FileAPI/BlobRegistryProxy.cpp (modified) (1 diff)
• WebProcess/FileAPI/BlobRegistryProxy.h (modified) (1 diff)
• WebProcess/Network/NetworkProcessConnection.cpp (modified) (2 diffs)
• WebProcess/Network/NetworkProcessConnection.h (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-06-05  Brady Eidson  <beidson@apple.com>
+
+        Unreviewed, rolling out r201694.
+
+        201693
+
+        Reverted changeset:
+
+        "Fix the build after r201693."
+        https://bugs.webkit.org/show_bug.cgi?id=158394
+        http://trac.webkit.org/changeset/201694
+
 2016-06-05  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp

@@ -133 +133 @@
 }
 
-void NetworkBlobRegistry::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, NoncopyableFunction<void(const Vector<String>&)>&& completionHandler)
+void NetworkBlobRegistry::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, std::function<void(const Vector<String>&)> completionHandler)
 {
-    blobRegistry().writeBlobsToTemporaryFiles(blobURLs, WTFMove(completionHandler));
+    blobRegistry().writeBlobsToTemporaryFiles(blobURLs, completionHandler);
 }
 

trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.h

@@ -31 +31 @@
 #include <wtf/HashMap.h>
 #include <wtf/HashSet.h>
-#include <wtf/NoncopyableFunction.h>
 
 namespace WebCore {
@@ -56 +55 @@
     void unregisterBlobURL(NetworkConnectionToWebProcess*, const WebCore::URL&);
     uint64_t blobSize(NetworkConnectionToWebProcess*, const WebCore::URL&);
-    void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, NoncopyableFunction<void(const Vector<String>&)>&& completionHandler);
+    void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, std::function<void(const Vector<String>&)> completionHandler);
 
     void connectionToWebProcessDidClose(NetworkConnectionToWebProcess*);

trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.cpp

@@ -82 +82 @@
 }
 
-void BlobRegistryProxy::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, NoncopyableFunction<void (const Vector<String>& filePaths)>&& completionHandler)
+void BlobRegistryProxy::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, std::function<void (const Vector<String>& filePaths)> completionHandler)
 {
-    WebProcess::singleton().networkConnection()->writeBlobsToTemporaryFiles(blobURLs, WTFMove(completionHandler));
+    WebProcess::singleton().networkConnection()->writeBlobsToTemporaryFiles(blobURLs, completionHandler);
 }
 

trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.h

@@ -40 +40 @@
     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, NoncopyableFunction<void (const Vector<String>& filePaths)>&& completionHandler) override;
+    void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, std::function<void (const Vector<String>& filePaths)> completionHandler) override;
 };
 

trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp

@@ -76 +76 @@
 
     Vector<String> dummyFilenames;
-    for (auto& handler : m_writeBlobToFileCompletionHandlers.values())
+    for (auto handler : m_writeBlobToFileCompletionHandlers.values())
         handler(dummyFilenames);
 
@@ -86 +86 @@
 }
 
-void NetworkProcessConnection::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, NoncopyableFunction<void (const Vector<String>& filePaths)>&& completionHandler)
+void NetworkProcessConnection::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, std::function<void (const Vector<String>& filePaths)> completionHandler)
 {
     static uint64_t writeBlobToFileIdentifier;
     uint64_t requestIdentifier = ++writeBlobToFileIdentifier;
 
-    m_writeBlobToFileCompletionHandlers.set(requestIdentifier, WTFMove(completionHandler));
+    m_writeBlobToFileCompletionHandlers.set(requestIdentifier, completionHandler);
 
     WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::WriteBlobsToTemporaryFiles(blobURLs, requestIdentifier), 0);

trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.h

@@ -59 +59 @@
     void didReceiveNetworkProcessConnectionMessage(IPC::Connection&, IPC::MessageDecoder&);
 
-    void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, NoncopyableFunction<void (const Vector<String>& filePaths)>&& completionHandler);
+    void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, std::function<void (const Vector<String>& filePaths)> completionHandler);
 
 private:
@@ -82 +82 @@
     RefPtr<IPC::Connection> m_connection;
 
-    HashMap<uint64_t, NoncopyableFunction<void (const Vector<String>&)>> m_writeBlobToFileCompletionHandlers;
+    HashMap<uint64_t, std::function<void (const Vector<String>&)>> m_writeBlobToFileCompletionHandlers;
 };