Changeset 201694 in webkit


Ignore:
Timestamp:
Jun 5, 2016 7:45:52 AM (8 years ago)
Author:
beidson@apple.com
Message:

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:
Location:
trunk/Source/WebKit2
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r201673 r201694  
     12016-06-05  Brady Eidson  <beidson@apple.com>
     2
     3        Fix the build after r201693.
     4        https://bugs.webkit.org/show_bug.cgi?id=158394
     5
     6        Reviewed by NOBODY (Build fix).
     7
     8        r201693 landed without the Source/WebKit2 changes, and I didn't have EWS/CQ available to check myself. *sigh*
     9       
     10        * NetworkProcess/FileAPI/NetworkBlobRegistry.cpp:
     11        (WebKit::NetworkBlobRegistry::writeBlobsToTemporaryFiles):
     12        * NetworkProcess/FileAPI/NetworkBlobRegistry.h:
     13       
     14        * WebProcess/FileAPI/BlobRegistryProxy.cpp:
     15        (WebKit::BlobRegistryProxy::writeBlobsToTemporaryFiles):
     16        * WebProcess/FileAPI/BlobRegistryProxy.h:
     17       
     18        * WebProcess/Network/NetworkProcessConnection.cpp:
     19        (WebKit::NetworkProcessConnection::didClose):
     20        (WebKit::NetworkProcessConnection::writeBlobsToTemporaryFiles):
     21        * WebProcess/Network/NetworkProcessConnection.h:
     22
    1232016-06-03  Commit Queue  <commit-queue@webkit.org>
    224

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

    r199730 r201694  
    133133}
    134134
    135 void NetworkBlobRegistry::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, std::function<void(const Vector<String>&)> completionHandler)
     135void NetworkBlobRegistry::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, NoncopyableFunction<void(const Vector<String>&)>&& completionHandler)
    136136{
    137     blobRegistry().writeBlobsToTemporaryFiles(blobURLs, completionHandler);
     137    blobRegistry().writeBlobsToTemporaryFiles(blobURLs, WTFMove(completionHandler));
    138138}
    139139

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

    r199524 r201694  
    3131#include <wtf/HashMap.h>
    3232#include <wtf/HashSet.h>
     33#include <wtf/NoncopyableFunction.h>
    3334
    3435namespace WebCore {
    … …  
    5556    void unregisterBlobURL(NetworkConnectionToWebProcess*, const WebCore::URL&);
    5657    uint64_t blobSize(NetworkConnectionToWebProcess*, const WebCore::URL&);
    57     void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, std::function<void(const Vector<String>&)> completionHandler);
     58    void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, NoncopyableFunction<void(const Vector<String>&)>&& completionHandler);
    5859
    5960    void connectionToWebProcessDidClose(NetworkConnectionToWebProcess*);

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

    r199708 r201694  
    8282}
    8383
    84 void BlobRegistryProxy::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, std::function<void (const Vector<String>& filePaths)> completionHandler)
     84void BlobRegistryProxy::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, NoncopyableFunction<void (const Vector<String>& filePaths)>&& completionHandler)
    8585{
    86     WebProcess::singleton().networkConnection()->writeBlobsToTemporaryFiles(blobURLs, completionHandler);
     86    WebProcess::singleton().networkConnection()->writeBlobsToTemporaryFiles(blobURLs, WTFMove(completionHandler));
    8787}
    8888

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

    r199708 r201694  
    4040    void registerBlobURLForSlice(const WebCore::URL&, const WebCore::URL& srcURL, long long start, long long end) override;
    4141    unsigned long long blobSize(const WebCore::URL&) override;
    42     void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, std::function<void (const Vector<String>& filePaths)> completionHandler) override;
     42    void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, NoncopyableFunction<void (const Vector<String>& filePaths)>&& completionHandler) override;
    4343};
    4444

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

    r199517 r201694  
    7676
    7777    Vector<String> dummyFilenames;
    78     for (auto handler : m_writeBlobToFileCompletionHandlers.values())
     78    for (auto& handler : m_writeBlobToFileCompletionHandlers.values())
    7979        handler(dummyFilenames);
    8080
    … …  
    8686}
    8787
    88 void NetworkProcessConnection::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, std::function<void (const Vector<String>& filePaths)> completionHandler)
     88void NetworkProcessConnection::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, NoncopyableFunction<void (const Vector<String>& filePaths)>&& completionHandler)
    8989{
    9090    static uint64_t writeBlobToFileIdentifier;
    9191    uint64_t requestIdentifier = ++writeBlobToFileIdentifier;
    9292
    93     m_writeBlobToFileCompletionHandlers.set(requestIdentifier, completionHandler);
     93    m_writeBlobToFileCompletionHandlers.set(requestIdentifier, WTFMove(completionHandler));
    9494
    9595    WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::WriteBlobsToTemporaryFiles(blobURLs, requestIdentifier), 0);

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

    r199043 r201694  
    5959    void didReceiveNetworkProcessConnectionMessage(IPC::Connection&, IPC::MessageDecoder&);
    6060
    61     void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, std::function<void (const Vector<String>& filePaths)> completionHandler);
     61    void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, NoncopyableFunction<void (const Vector<String>& filePaths)>&& completionHandler);
    6262
    6363private:
    … …  
    8282    RefPtr<IPC::Connection> m_connection;
    8383
    84     HashMap<uint64_t, std::function<void (const Vector<String>&)>> m_writeBlobToFileCompletionHandlers;
     84    HashMap<uint64_t, NoncopyableFunction<void (const Vector<String>&)>> m_writeBlobToFileCompletionHandlers;
    8585};
    8686
Note: See TracChangeset for help on using the changeset viewer.