⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 194264 in webkit


Ignore:
Timestamp:
Dec 18, 2015, 12:10:53 AM (11 years ago)
Author:
achristensen@apple.com
Message:

Add types for DownloadID and TaskIdentifier
​https://bugs.webkit.org/show_bug.cgi?id=152401

Reviewed by Brady Eidson.

DownloadID and TaskIdentifier used to both be just uint64_t's.
It is confusing to distinguish between them, so now they both have names.
We need a HashMap<TaskIdentifier, DownloadID> instead of a HashMap<uint64_t, uint64_t>.

  • NetworkProcess/NetworkConnectionToWebProcess.cpp:

(WebKit::storageSession):
(WebKit::NetworkConnectionToWebProcess::startDownload):
(WebKit::NetworkConnectionToWebProcess::convertMainResourceLoadToDownload):

  • NetworkProcess/NetworkConnectionToWebProcess.h:
  • NetworkProcess/NetworkConnectionToWebProcess.messages.in:
  • NetworkProcess/NetworkProcess.cpp:

(WebKit::NetworkProcess::deleteWebsiteDataForOrigins):
(WebKit::NetworkProcess::downloadRequest):
(WebKit::NetworkProcess::resumeDownload):
(WebKit::NetworkProcess::cancelDownload):
(WebKit::NetworkProcess::getNetworkProcessStatistics):
(WebKit::NetworkProcess::logDiagnosticMessage):
(WebKit::NetworkProcess::logDiagnosticMessageWithResult):
(WebKit::NetworkProcess::logDiagnosticMessageWithValue):

  • NetworkProcess/NetworkProcess.h:
  • NetworkProcess/NetworkProcess.messages.in:
  • NetworkProcess/NetworkSession.h:
  • NetworkProcess/cocoa/NetworkSessionCocoa.mm:

(WebKit::NetworkSession::createDataTaskWithRequest):
(WebKit::NetworkSession::dataTaskForIdentifier):
(WebKit::NetworkDataTask::resume):
(WebKit::NetworkDataTask::taskIdentifier): Deleted.

  • Shared/Downloads/Download.cpp:

(WebKit::Download::Download):
(WebKit::Download::messageSenderDestinationID):

  • Shared/Downloads/Download.h:

(WebKit::Download::downloadID):

  • Shared/Downloads/DownloadID.h: Added.

(WebKit::DownloadID::DownloadID):
(WebKit::DownloadID::operator==):
(WebKit::DownloadID::downloadID):
(IPC::ArgumentCoder<WebKit::DownloadID>::encode):
(IPC::ArgumentCoder<WebKit::DownloadID>::decode):
(WTF::DownloadIDHash::hash):
(WTF::DownloadIDHash::equal):
(WTF::HashTraits<WebKit::DownloadID>::emptyValue):
(WTF::HashTraits<WebKit::DownloadID>::constructDeletedValue):
(WTF::HashTraits<WebKit::DownloadID>::isDeletedValue):

  • Shared/Downloads/DownloadManager.cpp:

(WebKit::DownloadManager::DownloadManager):
(WebKit::DownloadManager::startDownload):
(WebKit::DownloadManager::convertHandleToDownload):
(WebKit::DownloadManager::resumeDownload):
(WebKit::DownloadManager::cancelDownload):

  • Shared/Downloads/DownloadManager.h:

(WebKit::DownloadManager::isDownloading):

  • UIProcess/API/C/WKDownload.cpp:

(WKDownloadGetID):
(WKDownloadCopyRequest):

  • UIProcess/Downloads/DownloadProxy.h:

(WebKit::DownloadProxy::downloadID):
(WebKit::DownloadProxy::request):
(WebKit::DownloadProxy::resumeData):

  • UIProcess/Downloads/DownloadProxyMap.cpp:

(WebKit::DownloadProxyMap::createDownloadProxy):
(WebKit::DownloadProxyMap::downloadFinished):
(WebKit::DownloadProxyMap::processDidClose):

  • UIProcess/Downloads/DownloadProxyMap.h:
  • UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::receivedPolicyDecision):
(WebKit::WebPageProxy::frameDidBecomeFrameSet):
(WebKit::WebPageProxy::decidePolicyForNavigationAction):
(WebKit::WebPageProxy::decidePolicyForResponse):
(WebKit::WebPageProxy::decidePolicyForResponseSync):

  • UIProcess/WebPageProxy.h:
  • UIProcess/WebPageProxy.messages.in:
  • WebKit2.xcodeproj/project.pbxproj:
  • WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:

(WebKit::WebFrameLoaderClient::dispatchDecidePolicyForResponse):
(WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction):

  • WebProcess/WebPage/WebFrame.cpp:

(WebKit::WebFrame::invalidatePolicyListener):
(WebKit::WebFrame::didReceivePolicyDecision):
(WebKit::WebFrame::startDownload):
(WebKit::WebFrame::convertMainResourceLoadToDownload):

  • WebProcess/WebPage/WebFrame.h:
  • WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::setSessionID):
(WebKit::WebPage::didReceivePolicyDecision):

  • WebProcess/WebPage/WebPage.h:
  • WebProcess/WebPage/WebPage.messages.in:
Location:
trunk/Source/WebKit2
Files:
1 added
27 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r194257 r194264  
     12015-12-18  Alex Christensen  <achristensen@webkit.org>
     2
     3        Add types for DownloadID and TaskIdentifier
     4        https://bugs.webkit.org/show_bug.cgi?id=152401
     5
     6        Reviewed by Brady Eidson.
     7
     8        DownloadID and TaskIdentifier used to both be just uint64_t's.
     9        It is confusing to distinguish between them, so now they both have names.
     10        We need a HashMap<TaskIdentifier, DownloadID> instead of a HashMap<uint64_t, uint64_t>.
     11
     12        * NetworkProcess/NetworkConnectionToWebProcess.cpp:
     13        (WebKit::storageSession):
     14        (WebKit::NetworkConnectionToWebProcess::startDownload):
     15        (WebKit::NetworkConnectionToWebProcess::convertMainResourceLoadToDownload):
     16        * NetworkProcess/NetworkConnectionToWebProcess.h:
     17        * NetworkProcess/NetworkConnectionToWebProcess.messages.in:
     18        * NetworkProcess/NetworkProcess.cpp:
     19        (WebKit::NetworkProcess::deleteWebsiteDataForOrigins):
     20        (WebKit::NetworkProcess::downloadRequest):
     21        (WebKit::NetworkProcess::resumeDownload):
     22        (WebKit::NetworkProcess::cancelDownload):
     23        (WebKit::NetworkProcess::getNetworkProcessStatistics):
     24        (WebKit::NetworkProcess::logDiagnosticMessage):
     25        (WebKit::NetworkProcess::logDiagnosticMessageWithResult):
     26        (WebKit::NetworkProcess::logDiagnosticMessageWithValue):
     27        * NetworkProcess/NetworkProcess.h:
     28        * NetworkProcess/NetworkProcess.messages.in:
     29        * NetworkProcess/NetworkSession.h:
     30        * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
     31        (WebKit::NetworkSession::createDataTaskWithRequest):
     32        (WebKit::NetworkSession::dataTaskForIdentifier):
     33        (WebKit::NetworkDataTask::resume):
     34        (WebKit::NetworkDataTask::taskIdentifier): Deleted.
     35        * Shared/Downloads/Download.cpp:
     36        (WebKit::Download::Download):
     37        (WebKit::Download::messageSenderDestinationID):
     38        * Shared/Downloads/Download.h:
     39        (WebKit::Download::downloadID):
     40        * Shared/Downloads/DownloadID.h: Added.
     41        (WebKit::DownloadID::DownloadID):
     42        (WebKit::DownloadID::operator==):
     43        (WebKit::DownloadID::downloadID):
     44        (IPC::ArgumentCoder<WebKit::DownloadID>::encode):
     45        (IPC::ArgumentCoder<WebKit::DownloadID>::decode):
     46        (WTF::DownloadIDHash::hash):
     47        (WTF::DownloadIDHash::equal):
     48        (WTF::HashTraits<WebKit::DownloadID>::emptyValue):
     49        (WTF::HashTraits<WebKit::DownloadID>::constructDeletedValue):
     50        (WTF::HashTraits<WebKit::DownloadID>::isDeletedValue):
     51        * Shared/Downloads/DownloadManager.cpp:
     52        (WebKit::DownloadManager::DownloadManager):
     53        (WebKit::DownloadManager::startDownload):
     54        (WebKit::DownloadManager::convertHandleToDownload):
     55        (WebKit::DownloadManager::resumeDownload):
     56        (WebKit::DownloadManager::cancelDownload):
     57        * Shared/Downloads/DownloadManager.h:
     58        (WebKit::DownloadManager::isDownloading):
     59        * UIProcess/API/C/WKDownload.cpp:
     60        (WKDownloadGetID):
     61        (WKDownloadCopyRequest):
     62        * UIProcess/Downloads/DownloadProxy.h:
     63        (WebKit::DownloadProxy::downloadID):
     64        (WebKit::DownloadProxy::request):
     65        (WebKit::DownloadProxy::resumeData):
     66        * UIProcess/Downloads/DownloadProxyMap.cpp:
     67        (WebKit::DownloadProxyMap::createDownloadProxy):
     68        (WebKit::DownloadProxyMap::downloadFinished):
     69        (WebKit::DownloadProxyMap::processDidClose):
     70        * UIProcess/Downloads/DownloadProxyMap.h:
     71        * UIProcess/WebPageProxy.cpp:
     72        (WebKit::WebPageProxy::receivedPolicyDecision):
     73        (WebKit::WebPageProxy::frameDidBecomeFrameSet):
     74        (WebKit::WebPageProxy::decidePolicyForNavigationAction):
     75        (WebKit::WebPageProxy::decidePolicyForResponse):
     76        (WebKit::WebPageProxy::decidePolicyForResponseSync):
     77        * UIProcess/WebPageProxy.h:
     78        * UIProcess/WebPageProxy.messages.in:
     79        * WebKit2.xcodeproj/project.pbxproj:
     80        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
     81        (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForResponse):
     82        (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction):
     83        * WebProcess/WebPage/WebFrame.cpp:
     84        (WebKit::WebFrame::invalidatePolicyListener):
     85        (WebKit::WebFrame::didReceivePolicyDecision):
     86        (WebKit::WebFrame::startDownload):
     87        (WebKit::WebFrame::convertMainResourceLoadToDownload):
     88        * WebProcess/WebPage/WebFrame.h:
     89        * WebProcess/WebPage/WebPage.cpp:
     90        (WebKit::WebPage::setSessionID):
     91        (WebKit::WebPage::didReceivePolicyDecision):
     92        * WebProcess/WebPage/WebPage.h:
     93        * WebProcess/WebPage/WebPage.messages.in:
     94
    1952015-12-17  Dan Bernstein  <mitz@apple.com>
    296

  • trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp

    r194255 r194264  
    178178}
    179179
    180 void NetworkConnectionToWebProcess::startDownload(SessionID sessionID, uint64_t downloadID, const ResourceRequest& request)
     180void NetworkConnectionToWebProcess::startDownload(SessionID sessionID, DownloadID downloadID, const ResourceRequest& request)
    181181{
    182182    NetworkProcess::singleton().downloadManager().startDownload(sessionID, downloadID, request);
    183183}
    184184
    185 void NetworkConnectionToWebProcess::convertMainResourceLoadToDownload(WebCore::SessionID sessionID, uint64_t mainResourceLoadIdentifier, uint64_t downloadID, const ResourceRequest& request, const ResourceResponse& response)
     185void NetworkConnectionToWebProcess::convertMainResourceLoadToDownload(SessionID sessionID, uint64_t mainResourceLoadIdentifier, DownloadID downloadID, const ResourceRequest& request, const ResourceResponse& response)
    186186{
    187187    auto& networkProcess = NetworkProcess::singleton();

  • trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h

    r194255 r194264  
    2929#include "BlockingResponseMap.h"
    3030#include "Connection.h"
     31#include "DownloadID.h"
    3132#include "NetworkConnectionToWebProcessMessages.h"
    3233#include <WebCore/ResourceLoadPriority.h>
    … …  
    7778    void setDefersLoading(ResourceLoadIdentifier, bool);
    7879    void crossOriginRedirectReceived(ResourceLoadIdentifier, const WebCore::URL& redirectURL);
    79     void startDownload(WebCore::SessionID, uint64_t downloadID, const WebCore::ResourceRequest&);
    80     void convertMainResourceLoadToDownload(WebCore::SessionID, uint64_t mainResourceLoadIdentifier, uint64_t downloadID, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
     80    void startDownload(WebCore::SessionID, DownloadID, const WebCore::ResourceRequest&);
     81    void convertMainResourceLoadToDownload(WebCore::SessionID, uint64_t mainResourceLoadIdentifier, DownloadID, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
    8182
    8283    void cookiesForDOM(WebCore::SessionID, const WebCore::URL& firstParty, const WebCore::URL&, String& result);

  • trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in

    r194255 r194264  
    3030    PrefetchDNS(String hostname)
    3131
    32     StartDownload(WebCore::SessionID sessionID, uint64_t downloadID, WebCore::ResourceRequest request)
    33     ConvertMainResourceLoadToDownload(WebCore::SessionID sessionID, uint64_t mainResourceLoadIdentifier, uint64_t downloadID, WebCore::ResourceRequest request, WebCore::ResourceResponse response)
     32    StartDownload(WebCore::SessionID sessionID, WebKit::DownloadID downloadID, WebCore::ResourceRequest request)
     33    ConvertMainResourceLoadToDownload(WebCore::SessionID sessionID, uint64_t mainResourceLoadIdentifier, WebKit::DownloadID downloadID, WebCore::ResourceRequest request, WebCore::ResourceResponse response)
    3434
    3535    CookiesForDOM(WebCore::SessionID sessionID, WebCore::URL firstParty, WebCore::URL url) -> (String result)

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

    r194255 r194264  
    433433}
    434434
    435 void NetworkProcess::downloadRequest(SessionID sessionID, uint64_t downloadID, const ResourceRequest& request)
     435void NetworkProcess::downloadRequest(SessionID sessionID, DownloadID downloadID, const ResourceRequest& request)
    436436{
    437437    downloadManager().startDownload(sessionID, downloadID, request);
    438438}
    439439
    440 void NetworkProcess::resumeDownload(SessionID sessionID, uint64_t downloadID, const IPC::DataReference& resumeData, const String& path, const WebKit::SandboxExtension::Handle& sandboxExtensionHandle)
     440void NetworkProcess::resumeDownload(SessionID sessionID, DownloadID downloadID, const IPC::DataReference& resumeData, const String& path, const WebKit::SandboxExtension::Handle& sandboxExtensionHandle)
    441441{
    442442    downloadManager().resumeDownload(sessionID, downloadID, resumeData, path, sandboxExtensionHandle);
    443443}
    444444
    445 void NetworkProcess::cancelDownload(uint64_t downloadID)
     445void NetworkProcess::cancelDownload(DownloadID downloadID)
    446446{
    447447    downloadManager().cancelDownload(downloadID);
    … …  
    475475}
    476476
    477 void NetworkProcess::logDiagnosticMessage(uint64_t webPageID, const String& message, const String& description, WebCore::ShouldSample shouldSample)
     477void NetworkProcess::logDiagnosticMessage(uint64_t webPageID, const String& message, const String& description, ShouldSample shouldSample)
    478478{
    479479    if (!DiagnosticLoggingClient::shouldLogAfterSampling(shouldSample))
    … …  
    483483}
    484484
    485 void NetworkProcess::logDiagnosticMessageWithResult(uint64_t webPageID, const String& message, const String& description, WebCore::DiagnosticLoggingResultType result, WebCore::ShouldSample shouldSample)
     485void NetworkProcess::logDiagnosticMessageWithResult(uint64_t webPageID, const String& message, const String& description, DiagnosticLoggingResultType result, ShouldSample shouldSample)
    486486{
    487487    if (!DiagnosticLoggingClient::shouldLogAfterSampling(shouldSample))
    … …  
    491491}
    492492
    493 void NetworkProcess::logDiagnosticMessageWithValue(uint64_t webPageID, const String& message, const String& description, const String& value, WebCore::ShouldSample shouldSample)
     493void NetworkProcess::logDiagnosticMessageWithValue(uint64_t webPageID, const String& message, const String& description, const String& value, ShouldSample shouldSample)
    494494{
    495495    if (!DiagnosticLoggingClient::shouldLogAfterSampling(shouldSample))

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

    r194255 r194264  
    150150    void clearDiskCache(std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler);
    151151
    152     void downloadRequest(WebCore::SessionID, uint64_t downloadID, const WebCore::ResourceRequest&);
    153     void resumeDownload(WebCore::SessionID, uint64_t downloadID, const IPC::DataReference& resumeData, const String& path, const SandboxExtension::Handle&);
    154     void cancelDownload(uint64_t downloadID);
     152    void downloadRequest(WebCore::SessionID, DownloadID, const WebCore::ResourceRequest&);
     153    void resumeDownload(WebCore::SessionID, DownloadID, const IPC::DataReference& resumeData, const String& path, const SandboxExtension::Handle&);
     154    void cancelDownload(DownloadID);
    155155    void setCacheModel(uint32_t);
    156156    void allowSpecificHTTPSCertificateForHost(const WebCore::CertificateInfo&, const String& host);

  • trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in

    r194255 r194264  
    4040    DeleteWebsiteDataForOrigins(WebCore::SessionID sessionID, uint64_t websiteDataTypes, Vector<WebCore::SecurityOriginData> origins, Vector<String> cookieHostNames, uint64_t callbackID)
    4141
    42     DownloadRequest(WebCore::SessionID sessionID, uint64_t downloadID, WebCore::ResourceRequest request)
    43     ResumeDownload(WebCore::SessionID sessionID, uint64_t downloadID, IPC::DataReference resumeData, String path, WebKit::SandboxExtension::Handle sandboxExtensionHandle)
    44     CancelDownload(uint64_t downloadID)
     42    DownloadRequest(WebCore::SessionID sessionID, WebKit::DownloadID downloadID, WebCore::ResourceRequest request)
     43    ResumeDownload(WebCore::SessionID sessionID, WebKit::DownloadID downloadID, IPC::DataReference resumeData, String path, WebKit::SandboxExtension::Handle sandboxExtensionHandle)
     44    CancelDownload(WebKit::DownloadID downloadID)
    4545
    4646    SetProcessSuppressionEnabled(bool flag)

  • trunk/Source/WebKit2/NetworkProcess/NetworkSession.h

    r194255 r194264  
    2727#define NetworkSession_h
    2828
     29#if PLATFORM(COCOA)
    2930OBJC_CLASS NSURLSession;
    3031OBJC_CLASS NSURLSessionDataTask;
    3132OBJC_CLASS NSOperationQueue;
    3233OBJC_CLASS WKNetworkSessionDelegate;
     34#endif
    3335
     36#include "DownloadID.h"
    3437#include <WebCore/FrameLoaderTypes.h>
    3538#include <WebCore/SessionID.h>
    … …  
    8184    void resume();
    8285
    83     uint64_t taskIdentifier();
     86    typedef uint64_t TaskIdentifier;
     87    TaskIdentifier taskIdentifier();
    8488
    8589    ~NetworkDataTask();
    … …  
    113117    Ref<NetworkDataTask> createDataTaskWithRequest(const WebCore::ResourceRequest&, NetworkSessionTaskClient&);
    114118
    115     NetworkDataTask* dataTaskForIdentifier(uint64_t);
     119    NetworkDataTask* dataTaskForIdentifier(NetworkDataTask::TaskIdentifier);
    116120
    117121private:
    118122    WebCore::SessionID m_sessionID;
    119     HashMap<uint64_t, NetworkDataTask*> m_dataTaskMap;
     123    HashMap<NetworkDataTask::TaskIdentifier, NetworkDataTask*> m_dataTaskMap;
     124    HashMap<NetworkDataTask::TaskIdentifier, DownloadID> m_downloadMap;
    120125#if PLATFORM(COCOA)
    121126    RetainPtr<NSURLSession> m_session;

  • trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm

    r194255 r194264  
    241241}
    242242
    243 NetworkDataTask* NetworkSession::dataTaskForIdentifier(uint64_t taskIdentifier)
     243NetworkDataTask* NetworkSession::dataTaskForIdentifier(NetworkDataTask::TaskIdentifier taskIdentifier)
    244244{
    245245    ASSERT(isMainThread());
    … …  
    275275}
    276276
    277 uint64_t NetworkDataTask::taskIdentifier()
     277auto NetworkDataTask::taskIdentifier() -> TaskIdentifier
    278278{
    279279    return [m_task taskIdentifier];

  • trunk/Source/WebKit2/Shared/Downloads/Download.cpp

    r194255 r194264  
    4545
    4646#if USE(NETWORK_SESSION)
    47 Download::Download(DownloadManager& downloadManager, const NetworkSession& session, uint64_t downloadID, const ResourceRequest& request)
     47Download::Download(DownloadManager& downloadManager, const NetworkSession& session, DownloadID downloadID, const ResourceRequest& request)
    4848#else
    49 Download::Download(DownloadManager& downloadManager, uint64_t downloadID, const ResourceRequest& request)
     49Download::Download(DownloadManager& downloadManager, DownloadID downloadID, const ResourceRequest& request)
    5050#endif
    5151    : m_downloadManager(downloadManager)
    … …  
    5656#endif
    5757{
    58     ASSERT(m_downloadID);
     58    ASSERT(m_downloadID.downloadID());
    5959
    6060    m_downloadManager.didCreateDownload();
    … …  
    163163uint64_t Download::messageSenderDestinationID()
    164164{
    165     return m_downloadID;
     165    return m_downloadID.downloadID();
    166166}
    167167

  • trunk/Source/WebKit2/Shared/Downloads/Download.h

    r194255 r194264  
    2727#define Download_h
    2828
     29#include "DownloadID.h"
    2930#include "MessageSender.h"
    3031#include "SandboxExtension.h"
    … …  
    7778public:
    7879#if USE(NETWORK_SESSION)
    79     Download(DownloadManager&, const NetworkSession&, uint64_t downloadID, const WebCore::ResourceRequest&);
     80    Download(DownloadManager&, const NetworkSession&, DownloadID, const WebCore::ResourceRequest&);
    8081#else
    81     Download(DownloadManager&, uint64_t downloadID, const WebCore::ResourceRequest&);
     82    Download(DownloadManager&, DownloadID, const WebCore::ResourceRequest&);
    8283#endif
    8384    ~Download();
    … …  
    9293    void cancel();
    9394
    94     uint64_t downloadID() const { return m_downloadID; }
     95    DownloadID downloadID() const { return m_downloadID; }
    9596
    9697    void didStart();
    … …  
    129130
    130131    DownloadManager& m_downloadManager;
    131     uint64_t m_downloadID;
     132    DownloadID m_downloadID;
    132133    WebCore::ResourceRequest m_request;
    133134

  • trunk/Source/WebKit2/Shared/Downloads/DownloadManager.cpp

    r194255 r194264  
    4242}
    4343
    44 void DownloadManager::startDownload(SessionID sessionID, uint64_t downloadID, const ResourceRequest& request)
     44void DownloadManager::startDownload(SessionID sessionID, DownloadID downloadID, const ResourceRequest& request)
    4545{
    4646#if USE(NETWORK_SESSION)
    … …  
    5959
    6060#if !USE(NETWORK_SESSION)
    61 void DownloadManager::convertHandleToDownload(uint64_t downloadID, ResourceHandle* handle, const ResourceRequest& request, const ResourceResponse& response)
     61void DownloadManager::convertHandleToDownload(DownloadID downloadID, ResourceHandle* handle, const ResourceRequest& request, const ResourceResponse& response)
    6262{
    6363    auto download = std::make_unique<Download>(*this, downloadID, request);
    … …  
    6969#endif
    7070
    71 void DownloadManager::resumeDownload(WebCore::SessionID, uint64_t downloadID, const IPC::DataReference& resumeData, const String& path, const SandboxExtension::Handle& sandboxExtensionHandle)
     71void DownloadManager::resumeDownload(SessionID, DownloadID downloadID, const IPC::DataReference& resumeData, const String& path, const SandboxExtension::Handle& sandboxExtensionHandle)
    7272{
    7373#if USE(NETWORK_SESSION)
    … …  
    8383}
    8484
    85 void DownloadManager::cancelDownload(uint64_t downloadID)
     85void DownloadManager::cancelDownload(DownloadID downloadID)
    8686{
    8787    Download* download = m_downloads.get(downloadID);

  • trunk/Source/WebKit2/Shared/Downloads/DownloadManager.h

    r194255 r194264  
    2727#define DownloadManager_h
    2828
     29#include "Download.h"
    2930#include "SandboxExtension.h"
    3031#include <WebCore/NotImplemented.h>
    … …  
    7071    explicit DownloadManager(Client*);
    7172
    72     void startDownload(WebCore::SessionID, uint64_t downloadID, const WebCore::ResourceRequest&);
     73    void startDownload(WebCore::SessionID, DownloadID, const WebCore::ResourceRequest&);
    7374#if !USE(NETWORK_SESSION)
    74     void convertHandleToDownload(uint64_t downloadID, WebCore::ResourceHandle*, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
     75    void convertHandleToDownload(DownloadID, WebCore::ResourceHandle*, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
    7576#endif
    7677
    77     void resumeDownload(WebCore::SessionID, uint64_t downloadID, const IPC::DataReference& resumeData, const String& path, const SandboxExtension::Handle&);
     78    void resumeDownload(WebCore::SessionID, DownloadID, const IPC::DataReference& resumeData, const String& path, const SandboxExtension::Handle&);
    7879
    79     void cancelDownload(uint64_t downloadID);
     80    void cancelDownload(DownloadID);
    8081
    8182    void downloadFinished(Download*);
    … …  
    9192private:
    9293    Client* m_client;
    93     HashMap<uint64_t, std::unique_ptr<Download>> m_downloads;
     94    HashMap<DownloadID, std::unique_ptr<Download>> m_downloads;
    9495};
    9596

  • trunk/Source/WebKit2/UIProcess/API/C/WKDownload.cpp

    r194255 r194264  
    4141uint64_t WKDownloadGetID(WKDownloadRef download)
    4242{
    43     return toImpl(download)->downloadID();
     43    return toImpl(download)->downloadID().downloadID();
    4444}
    4545

  • trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.h

    r194255 r194264  
    2929#include "APIObject.h"
    3030#include "Connection.h"
     31#include "DownloadID.h"
    3132#include "SandboxExtension.h"
    3233#include <WebCore/ResourceRequest.h>
    … …  
    5556    ~DownloadProxy();
    5657
    57     uint64_t downloadID() const { return m_downloadID; }
     58    DownloadID downloadID() const { return m_downloadID; }
    5859    const WebCore::ResourceRequest& request() const { return m_request; }
    5960    API::Data* resumeData() const { return m_resumeData.get(); }
    … …  
    8889    DownloadProxyMap& m_downloadProxyMap;
    8990    RefPtr<WebProcessPool> m_processPool;
    90     uint64_t m_downloadID;
     91    DownloadID m_downloadID;
    9192
    9293    RefPtr<API::Data> m_resumeData;

  • trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxyMap.cpp

    r194255 r194264  
    5050    m_downloads.set(downloadProxy->downloadID(), downloadProxy);
    5151
    52     m_process->addMessageReceiver(Messages::DownloadProxy::messageReceiverName(), downloadProxy->downloadID(), *downloadProxy);
     52    m_process->addMessageReceiver(Messages::DownloadProxy::messageReceiverName(), downloadProxy->downloadID().downloadID(), *downloadProxy);
    5353
    5454    return downloadProxy.get();
    … …  
    5757void DownloadProxyMap::downloadFinished(DownloadProxy* downloadProxy)
    5858{
    59     uint64_t downloadID = downloadProxy->downloadID();
     59    auto downloadID = downloadProxy->downloadID();
    6060
    6161    ASSERT(m_downloads.contains(downloadID));
    6262
    63     m_process->removeMessageReceiver(Messages::DownloadProxy::messageReceiverName(), downloadID);
     63    m_process->removeMessageReceiver(Messages::DownloadProxy::messageReceiverName(), downloadID.downloadID());
    6464    downloadProxy->invalidate();
    6565    m_downloads.remove(downloadID);
    … …  
    6969{
    7070    // Invalidate all outstanding downloads.
    71     for (HashMap<uint64_t, RefPtr<DownloadProxy>>::iterator::Values it = m_downloads.begin().values(), end = m_downloads.end().values(); it != end; ++it) {
     71    for (auto it = m_downloads.begin().values(), end = m_downloads.end().values(); it != end; ++it) {
    7272        (*it)->processDidClose();
    7373        (*it)->invalidate();

  • trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxyMap.h

    r194255 r194264  
    2727#define DownloadProxyMap_h
    2828
     29#include "DownloadID.h"
    2930#include <wtf/HashMap.h>
    3031#include <wtf/Noncopyable.h>
    … …  
    5758private:
    5859    ChildProcessProxy* m_process;
    59     HashMap<uint64_t, RefPtr<DownloadProxy>> m_downloads;
     60    HashMap<DownloadID, RefPtr<DownloadProxy>> m_downloads;
    6061};
    6162

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

    r194255 r194264  
    20162016        m_pageLoadState.clearPendingAPIRequestURL(transaction);
    20172017
    2018     uint64_t downloadID = 0;
     2018    DownloadID downloadID = { };
    20192019    if (action == PolicyDownload) {
    20202020        // Create a download proxy.
    … …  
    32513251}
    32523252
    3253 void WebPageProxy::decidePolicyForNavigationAction(uint64_t frameID, const SecurityOriginData& frameSecurityOrigin, uint64_t navigationID, const NavigationActionData& navigationActionData, uint64_t originatingFrameID, const SecurityOriginData& originatingFrameSecurityOrigin, const WebCore::ResourceRequest& originalRequest, const ResourceRequest& request, uint64_t listenerID, const UserData& userData, bool& receivedPolicyAction, uint64_t& newNavigationID, uint64_t& policyAction, uint64_t& downloadID)
     3253void WebPageProxy::decidePolicyForNavigationAction(uint64_t frameID, const SecurityOriginData& frameSecurityOrigin, uint64_t navigationID, const NavigationActionData& navigationActionData, uint64_t originatingFrameID, const SecurityOriginData& originatingFrameSecurityOrigin, const WebCore::ResourceRequest& originalRequest, const ResourceRequest& request, uint64_t listenerID, const UserData& userData, bool& receivedPolicyAction, uint64_t& newNavigationID, uint64_t& policyAction, DownloadID& downloadID)
    32543254{
    32553255    PageClientProtector protector(m_pageClient);
    … …  
    33603360}
    33613361
    3362 void WebPageProxy::decidePolicyForResponseSync(uint64_t frameID, const SecurityOriginData& frameSecurityOrigin, const ResourceResponse& response, const ResourceRequest& request, bool canShowMIMEType, uint64_t listenerID, const UserData& userData, bool& receivedPolicyAction, uint64_t& policyAction, uint64_t& downloadID)
     3362void WebPageProxy::decidePolicyForResponseSync(uint64_t frameID, const SecurityOriginData& frameSecurityOrigin, const ResourceResponse& response, const ResourceRequest& request, bool canShowMIMEType, uint64_t listenerID, const UserData& userData, bool& receivedPolicyAction, uint64_t& policyAction, DownloadID& downloadID)
    33633363{
    33643364    PageClientProtector protector(m_pageClient);

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.h

    r194255 r194264  
    3333#include "Connection.h"
    3434#include "ContextMenuContextData.h"
     35#include "DownloadID.h"
    3536#include "DragControllerAction.h"
    3637#include "DrawingAreaProxy.h"
    … …  
    11341135    void didDestroyNavigation(uint64_t navigationID);
    11351136
    1136     void decidePolicyForNavigationAction(uint64_t frameID, const WebCore::SecurityOriginData& frameSecurityOrigin, uint64_t navigationID, const NavigationActionData&, uint64_t originatingFrameID, const WebCore::SecurityOriginData& originatingFrameSecurityOrigin, const WebCore::ResourceRequest& originalRequest, const WebCore::ResourceRequest&, uint64_t listenerID, const UserData&, bool& receivedPolicyAction, uint64_t& newNavigationID, uint64_t& policyAction, uint64_t& downloadID);
     1137    void decidePolicyForNavigationAction(uint64_t frameID, const WebCore::SecurityOriginData& frameSecurityOrigin, uint64_t navigationID, const NavigationActionData&, uint64_t originatingFrameID, const WebCore::SecurityOriginData& originatingFrameSecurityOrigin, const WebCore::ResourceRequest& originalRequest, const WebCore::ResourceRequest&, uint64_t listenerID, const UserData&, bool& receivedPolicyAction, uint64_t& newNavigationID, uint64_t& policyAction, DownloadID&);
    11371138    void decidePolicyForNewWindowAction(uint64_t frameID, const WebCore::SecurityOriginData& frameSecurityOrigin, const NavigationActionData&, const WebCore::ResourceRequest&, const String& frameName, uint64_t listenerID, const UserData&);
    11381139    void decidePolicyForResponse(uint64_t frameID, const WebCore::SecurityOriginData& frameSecurityOrigin, const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, bool canShowMIMEType, uint64_t listenerID, const UserData&);
    1139     void decidePolicyForResponseSync(uint64_t frameID, const WebCore::SecurityOriginData& frameSecurityOrigin, const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, bool canShowMIMEType, uint64_t listenerID, const UserData&, bool& receivedPolicyAction, uint64_t& policyAction, uint64_t& downloadID);
     1140    void decidePolicyForResponseSync(uint64_t frameID, const WebCore::SecurityOriginData& frameSecurityOrigin, const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, bool canShowMIMEType, uint64_t listenerID, const UserData&, bool& receivedPolicyAction, uint64_t& policyAction, DownloadID&);
    11401141    void unableToImplementPolicy(uint64_t frameID, const WebCore::ResourceError&, const UserData&);
    11411142
    … …  
    16171618    bool m_syncMimeTypePolicyActionIsValid;
    16181619    WebCore::PolicyAction m_syncMimeTypePolicyAction;
    1619     uint64_t m_syncMimeTypePolicyDownloadID;
     1620    DownloadID m_syncMimeTypePolicyDownloadID;
    16201621
    16211622    bool m_inDecidePolicyForNavigationAction;
    16221623    bool m_syncNavigationActionPolicyActionIsValid;
    16231624    WebCore::PolicyAction m_syncNavigationActionPolicyAction;
    1624     uint64_t m_syncNavigationActionPolicyDownloadID;
     1625    DownloadID m_syncNavigationActionPolicyDownloadID;
    16251626    bool m_shouldSuppressAppLinksInNextNavigationPolicyDecision { false };
    16261627

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in

    r194255 r194264  
    106106
    107107    # Policy messages
    108     DecidePolicyForResponseSync(uint64_t frameID, struct WebCore::SecurityOriginData frameSecurityOrigin, WebCore::ResourceResponse response, WebCore::ResourceRequest request, bool canShowMIMEType, uint64_t listenerID, WebKit::UserData userData) -> (bool receivedPolicyAction, uint64_t policyAction, uint64_t downloadID)
    109     DecidePolicyForNavigationAction(uint64_t frameID, struct WebCore::SecurityOriginData frameSecurityOrigin, uint64_t navigationID, struct WebKit::NavigationActionData navigationActionData, uint64_t originatingFrameID, struct WebCore::SecurityOriginData originatingFrameSecurityOrigin, WebCore::ResourceRequest originalRequest, WebCore::ResourceRequest request, uint64_t listenerID, WebKit::UserData userData) -> (bool receivedPolicyAction, uint64_t newNavigationID, uint64_t policyAction, uint64_t downloadID)
     108    DecidePolicyForResponseSync(uint64_t frameID, struct WebCore::SecurityOriginData frameSecurityOrigin, WebCore::ResourceResponse response, WebCore::ResourceRequest request, bool canShowMIMEType, uint64_t listenerID, WebKit::UserData userData) -> (bool receivedPolicyAction, uint64_t policyAction, WebKit::DownloadID downloadID)
     109    DecidePolicyForNavigationAction(uint64_t frameID, struct WebCore::SecurityOriginData frameSecurityOrigin, uint64_t navigationID, struct WebKit::NavigationActionData navigationActionData, uint64_t originatingFrameID, struct WebCore::SecurityOriginData originatingFrameSecurityOrigin, WebCore::ResourceRequest originalRequest, WebCore::ResourceRequest request, uint64_t listenerID, WebKit::UserData userData) -> (bool receivedPolicyAction, uint64_t newNavigationID, uint64_t policyAction, WebKit::DownloadID downloadID)
    110110    DecidePolicyForNewWindowAction(uint64_t frameID, struct WebCore::SecurityOriginData frameSecurityOrigin, struct WebKit::NavigationActionData navigationActionData, WebCore::ResourceRequest request, String frameName, uint64_t listenerID, WebKit::UserData userData)
    111111    UnableToImplementPolicy(uint64_t frameID, WebCore::ResourceError error, WebKit::UserData userData)

  • trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

    r194255 r194264  
    10651065                5272B28B1406985D0096A5D0 /* StatisticsData.h in Headers */ = {isa = PBXBuildFile; fileRef = 5272B2891406985D0096A5D0 /* StatisticsData.h */; };
    10661066                528C37C1195CBB1A00D8B9CC /* WKBackForwardListPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9F28101958F478008CAC72 /* WKBackForwardListPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
     1067                5C1426E11C23F50B00D41183 /* DownloadID.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C0932061C236011007AAA7C /* DownloadID.h */; };
    10671068                5C20CB9D1BB0DCFA00895BB1 /* NetworkSessionCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C20CB9B1BB0DCD200895BB1 /* NetworkSessionCocoa.mm */; };
    10681069                5C20CBA01BB1ECD800895BB1 /* NetworkSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C20CB9E1BB0DD1800895BB1 /* NetworkSession.h */; };
    … …  
    32573258                5272B2881406985D0096A5D0 /* StatisticsData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StatisticsData.cpp; sourceTree = "<group>"; };
    32583259                5272B2891406985D0096A5D0 /* StatisticsData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StatisticsData.h; sourceTree = "<group>"; };
     3260                5C0932061C236011007AAA7C /* DownloadID.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DownloadID.h; path = Downloads/DownloadID.h; sourceTree = "<group>"; };
    32593261                5C20CB9B1BB0DCD200895BB1 /* NetworkSessionCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = NetworkSessionCocoa.mm; path = NetworkProcess/cocoa/NetworkSessionCocoa.mm; sourceTree = "<group>"; };
    32603262                5C20CB9E1BB0DD1800895BB1 /* NetworkSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkSession.h; path = NetworkProcess/NetworkSession.h; sourceTree = "<group>"; };
    … …  
    57465748                        isa = PBXGroup;
    57475749                        children = (
     5750                                5C0932061C236011007AAA7C /* DownloadID.h */,
    57485751                                5C9B860E1C223E5400110F36 /* cocoa */,
    57495752                                2DA944A51884E93C00ED86DB /* ios */,
    … …  
    83138316                                E1AEA22F14687BDB00804569 /* WKFullKeyboardAccessWatcher.h in Headers */,
    83148317                                CDCA85C9132ABA4E00E961DF /* WKFullScreenWindowController.h in Headers */,
     8318                                5C1426E11C23F50B00D41183 /* DownloadID.h in Headers */,
    83158319                                BC54CC1212D674EE005C67B0 /* WKGeolocationManager.h in Headers */,
    83168320                                BC06F44E12DBDF3F002D78DE /* WKGeolocationPermissionRequest.h in Headers */,

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

    r194255 r194264  
    695695    bool receivedPolicyAction;
    696696    uint64_t policyAction;
    697     uint64_t downloadID;
     697    DownloadID downloadID;
    698698
    699699    unsigned syncSendFlags = IPC::InformPlatformProcessWillSuspend;
    … …  
    703703    WebCore::Frame* coreFrame = m_frame ? m_frame->coreFrame() : nullptr;
    704704    if (!webPage->sendSync(Messages::WebPageProxy::DecidePolicyForResponseSync(m_frame->frameID(), SecurityOriginData::fromFrame(coreFrame), response, request, canShowMIMEType, listenerID, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())), Messages::WebPageProxy::DecidePolicyForResponseSync::Reply(receivedPolicyAction, policyAction, downloadID), std::chrono::milliseconds::max(), syncSendFlags)) {
    705         m_frame->didReceivePolicyDecision(listenerID, PolicyIgnore, 0, 0);
     705        m_frame->didReceivePolicyDecision(listenerID, PolicyIgnore, 0, { });
    706706        return;
    707707    }
    … …  
    776776    uint64_t newNavigationID;
    777777    uint64_t policyAction;
    778     uint64_t downloadID;
     778    DownloadID downloadID;
    779779
    780780    RefPtr<WebFrame> originatingFrame;
    … …  
    815815    WebCore::Frame* originatingCoreFrame = originatingFrame ? originatingFrame->coreFrame() : nullptr;
    816816    if (!webPage->sendSync(Messages::WebPageProxy::DecidePolicyForNavigationAction(m_frame->frameID(), SecurityOriginData::fromFrame(coreFrame), documentLoader->navigationID(), navigationActionData, originatingFrame ? originatingFrame->frameID() : 0, SecurityOriginData::fromFrame(originatingCoreFrame), navigationAction.resourceRequest(), request, listenerID, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())), Messages::WebPageProxy::DecidePolicyForNavigationAction::Reply(receivedPolicyAction, newNavigationID, policyAction, downloadID))) {
    817         m_frame->didReceivePolicyDecision(listenerID, PolicyIgnore, 0, 0);
     817        m_frame->didReceivePolicyDecision(listenerID, PolicyIgnore, 0, { });
    818818        return;
    819819    }

  • trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp

    r194255 r194264  
    216216        return;
    217217
    218     m_policyDownloadID = 0;
     218    m_policyDownloadID = { };
    219219    m_policyListenerID = 0;
    220220    m_policyFunction = 0;
    221221}
    222222
    223 void WebFrame::didReceivePolicyDecision(uint64_t listenerID, PolicyAction action, uint64_t navigationID, uint64_t downloadID)
     223void WebFrame::didReceivePolicyDecision(uint64_t listenerID, PolicyAction action, uint64_t navigationID, DownloadID downloadID)
    224224{
    225225    if (!m_coreFrame)
    … …  
    249249void WebFrame::startDownload(const WebCore::ResourceRequest& request)
    250250{
    251     ASSERT(m_policyDownloadID);
    252 
    253     uint64_t policyDownloadID = m_policyDownloadID;
    254     m_policyDownloadID = 0;
     251    ASSERT(m_policyDownloadID.downloadID());
     252
     253    auto policyDownloadID = m_policyDownloadID;
     254    m_policyDownloadID = { };
    255255
    256256    auto& webProcess = WebProcess::singleton();
    … …  
    261261void WebFrame::convertMainResourceLoadToDownload(DocumentLoader* documentLoader, SessionID sessionID, const ResourceRequest& request, const ResourceResponse& response)
    262262{
    263     ASSERT(m_policyDownloadID);
    264 
    265     uint64_t policyDownloadID = m_policyDownloadID;
    266     m_policyDownloadID = 0;
     263    ASSERT(m_policyDownloadID.downloadID());
     264
     265    auto policyDownloadID = m_policyDownloadID;
     266    m_policyDownloadID = { };
    267267
    268268    SubresourceLoader* mainResourceLoader = documentLoader->mainResourceLoader();

  • trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.h

    r194255 r194264  
    2828
    2929#include "APIObject.h"
     30#include "DownloadID.h"
    3031#include "ShareableBitmap.h"
    3132#include "WKBase.h"
    … …  
    8182    uint64_t setUpPolicyListener(WebCore::FramePolicyFunction);
    8283    void invalidatePolicyListener();
    83     void didReceivePolicyDecision(uint64_t listenerID, WebCore::PolicyAction, uint64_t navigationID, uint64_t downloadID);
     84    void didReceivePolicyDecision(uint64_t listenerID, WebCore::PolicyAction, uint64_t navigationID, DownloadID);
    8485
    8586    void startDownload(const WebCore::ResourceRequest&);
    … …  
    171172    uint64_t m_policyListenerID;
    172173    WebCore::FramePolicyFunction m_policyFunction;
    173     uint64_t m_policyDownloadID;
     174    DownloadID m_policyDownloadID;
    174175
    175176    std::unique_ptr<WebFrameLoaderClient> m_frameLoaderClient;

  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

    r194255 r194264  
    24092409}
    24102410
    2411 void WebPage::didReceivePolicyDecision(uint64_t frameID, uint64_t listenerID, uint32_t policyAction, uint64_t navigationID, uint64_t downloadID)
     2411void WebPage::didReceivePolicyDecision(uint64_t frameID, uint64_t listenerID, uint32_t policyAction, uint64_t navigationID, DownloadID downloadID)
    24122412{
    24132413    WebFrame* frame = WebProcess::singleton().webFrame(frameID);

  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h

    r194255 r194264  
    3131#include "APIInjectedBundlePageUIClient.h"
    3232#include "APIObject.h"
     33#include "Download.h"
    3334#include "FindController.h"
    3435#include "GeolocationPermissionRequestManager.h"
    … …  
    10441045    void updatePreferences(const WebPreferencesStore&);
    10451046
    1046     void didReceivePolicyDecision(uint64_t frameID, uint64_t listenerID, uint32_t policyAction, uint64_t navigationID, uint64_t downloadID);
     1047    void didReceivePolicyDecision(uint64_t frameID, uint64_t listenerID, uint32_t policyAction, uint64_t navigationID, DownloadID);
    10471048    void setUserAgent(const String&);
    10481049    void setCustomTextEncodingName(const String&);

  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in

    r194255 r194264  
    142142    DidRemoveBackForwardItem(uint64_t backForwardItemID)
    143143
    144     DidReceivePolicyDecision(uint64_t frameID, uint64_t listenerID, uint32_t policyAction, uint64_t navigationID, uint64_t downloadID)
     144    DidReceivePolicyDecision(uint64_t frameID, uint64_t listenerID, uint32_t policyAction, uint64_t navigationID, WebKit::DownloadID downloadID)
    145145
    146146    ClearSelection()
Note: See TracChangeset for help on using the changeset viewer.