Changeset 224791 in webkit


Ignore:
Timestamp:
Nov 13, 2017, 3:50:47 PM (7 years ago)
Author:
achristensen@apple.com
Message:

Merge NetworkProcess::EnsurePrivateBrowsingSession and NetworkProcess::AddWebsiteDataStore into one message type
​https://bugs.webkit.org/show_bug.cgi?id=178751

Reviewed by Brady Eidson.

Source/WebCore:

The creation of private browsing sessions and persistent browsing sessions has evolved to be the same thing
with differences in parameters, like no sandbox extensions or paths to persistent storage locations for private browsing.
These should be united to simplify future development of WebsiteDataStore construction.

  • platform/network/NetworkStorageSession.h:
  • platform/network/cf/NetworkStorageSessionCFNet.cpp:

(WebCore::NetworkStorageSession::ensurePrivateBrowsingSession): Deleted.

  • platform/network/soup/NetworkStorageSessionSoup.cpp:

(WebCore::NetworkStorageSession::ensureSession):
(WebCore::NetworkStorageSession::ensurePrivateBrowsingSession): Deleted.

Source/WebKit:

  • NetworkProcess/NetworkConnectionToWebProcess.cpp:

(WebKit::NetworkConnectionToWebProcess::ensureLegacyPrivateBrowsingSession):

  • NetworkProcess/NetworkProcess.cpp:

(WebKit::NetworkProcess::initializeNetworkProcess):
(WebKit::NetworkProcess::ensurePrivateBrowsingSession): Deleted.

  • NetworkProcess/NetworkProcess.h:
  • NetworkProcess/NetworkProcess.messages.in:
  • NetworkProcess/RemoteNetworkingContext.h:
  • NetworkProcess/mac/RemoteNetworkingContext.mm:

(WebKit::RemoteNetworkingContext::ensureWebsiteDataStoreSession):
(WebKit::RemoteNetworkingContext::ensurePrivateBrowsingSession): Deleted.

  • Shared/WebsiteDataStoreParameters.cpp:

(WebKit::WebsiteDataStoreParameters::legacyPrivateSessionParameters):

  • Shared/WebsiteDataStoreParameters.h:
  • UIProcess/WebProcessPool.cpp:

(WebKit::WebProcessPool::setAnyPageGroupMightHavePrivateBrowsingEnabled):
(WebKit::WebProcessPool::createNewWebProcess):
(WebKit::WebProcessPool::pageAddedToProcess):

  • WebProcess/InjectedBundle/InjectedBundle.cpp:

(WebKit::InjectedBundle::setPrivateBrowsingEnabled):

  • WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.h:
  • WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm:

(WebKit::WebFrameNetworkingContext::ensureWebsiteDataStoreSession):
(WebKit::WebFrameNetworkingContext::ensurePrivateBrowsingSession): Deleted.

  • WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::setSessionID):

  • WebProcess/WebProcess.cpp:

(WebKit::WebProcess::ensurePrivateBrowsingSession): Deleted.

  • WebProcess/WebProcess.h:
  • WebProcess/WebProcess.messages.in:

Source/WebKitLegacy/mac:

  • WebCoreSupport/WebFrameNetworkingContext.mm:

(WebFrameNetworkingContext::ensurePrivateBrowsingSession):

Location:
trunk/Source
Files:
26 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r224789 r224791  
     12017-11-13  Alex Christensen  <achristensen@webkit.org>
     2
     3        Merge NetworkProcess::EnsurePrivateBrowsingSession and NetworkProcess::AddWebsiteDataStore into one message type
     4        https://bugs.webkit.org/show_bug.cgi?id=178751
     5
     6        Reviewed by Brady Eidson.
     7
     8        The creation of private browsing sessions and persistent browsing sessions has evolved to be the same thing
     9        with differences in parameters, like no sandbox extensions or paths to persistent storage locations for private browsing.
     10        These should be united to simplify future development of WebsiteDataStore construction.
     11
     12        * platform/network/NetworkStorageSession.h:
     13        * platform/network/cf/NetworkStorageSessionCFNet.cpp:
     14        (WebCore::NetworkStorageSession::ensurePrivateBrowsingSession): Deleted.
     15        * platform/network/soup/NetworkStorageSessionSoup.cpp:
     16        (WebCore::NetworkStorageSession::ensureSession):
     17        (WebCore::NetworkStorageSession::ensurePrivateBrowsingSession): Deleted.
     18
    1192017-11-07  Brian Burg  <bburg@apple.com>
    220

  • trunk/Source/WebCore/platform/network/NetworkStorageSession.h

    r223207 r224791  
    6464    WEBCORE_EXPORT static NetworkStorageSession& defaultStorageSession();
    6565    WEBCORE_EXPORT static NetworkStorageSession* storageSession(PAL::SessionID);
    66     WEBCORE_EXPORT static void ensurePrivateBrowsingSession(PAL::SessionID, const String& identifierBase = String());
    6766    WEBCORE_EXPORT static void ensureSession(PAL::SessionID, const String& identifierBase = String());
    6867    WEBCORE_EXPORT static void destroySession(PAL::SessionID);

  • trunk/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp

    r222898 r224791  
    109109}
    110110
    111 void NetworkStorageSession::ensurePrivateBrowsingSession(PAL::SessionID sessionID, const String& identifierBase)
    112 {
    113     ASSERT(sessionID.isEphemeral());
    114     ensureSession(sessionID, identifierBase);
    115 }
    116 
    117111void NetworkStorageSession::ensureSession(PAL::SessionID sessionID, const String& identifierBase, RetainPtr<CFHTTPCookieStorageRef>&& cookieStorage)
    118112{

  • trunk/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp

    r222706 r224791  
    8080}
    8181
    82 void NetworkStorageSession::ensurePrivateBrowsingSession(PAL::SessionID sessionID, const String&)
    83 {
    84     ASSERT(sessionID != PAL::SessionID::defaultSessionID());
     82void NetworkStorageSession::ensureSession(PAL::SessionID sessionID, const String&)
     83{
    8584    ASSERT(!globalSessionMap().contains(sessionID));
    8685    globalSessionMap().add(sessionID, std::make_unique<NetworkStorageSession>(sessionID, std::make_unique<SoupNetworkSession>(sessionID)));
    87 }
    88 
    89 void NetworkStorageSession::ensureSession(PAL::SessionID, const String&)
    90 {
    91     // FIXME: Implement
    9286}
    9387

  • trunk/Source/WebKit/ChangeLog

    r224790 r224791  
     12017-11-13  Alex Christensen  <achristensen@webkit.org>
     2
     3        Merge NetworkProcess::EnsurePrivateBrowsingSession and NetworkProcess::AddWebsiteDataStore into one message type
     4        https://bugs.webkit.org/show_bug.cgi?id=178751
     5
     6        Reviewed by Brady Eidson.
     7
     8        * NetworkProcess/NetworkConnectionToWebProcess.cpp:
     9        (WebKit::NetworkConnectionToWebProcess::ensureLegacyPrivateBrowsingSession):
     10        * NetworkProcess/NetworkProcess.cpp:
     11        (WebKit::NetworkProcess::initializeNetworkProcess):
     12        (WebKit::NetworkProcess::ensurePrivateBrowsingSession): Deleted.
     13        * NetworkProcess/NetworkProcess.h:
     14        * NetworkProcess/NetworkProcess.messages.in:
     15        * NetworkProcess/RemoteNetworkingContext.h:
     16        * NetworkProcess/mac/RemoteNetworkingContext.mm:
     17        (WebKit::RemoteNetworkingContext::ensureWebsiteDataStoreSession):
     18        (WebKit::RemoteNetworkingContext::ensurePrivateBrowsingSession): Deleted.
     19        * Shared/WebsiteDataStoreParameters.cpp:
     20        (WebKit::WebsiteDataStoreParameters::legacyPrivateSessionParameters):
     21        * Shared/WebsiteDataStoreParameters.h:
     22        * UIProcess/WebProcessPool.cpp:
     23        (WebKit::WebProcessPool::setAnyPageGroupMightHavePrivateBrowsingEnabled):
     24        (WebKit::WebProcessPool::createNewWebProcess):
     25        (WebKit::WebProcessPool::pageAddedToProcess):
     26        * WebProcess/InjectedBundle/InjectedBundle.cpp:
     27        (WebKit::InjectedBundle::setPrivateBrowsingEnabled):
     28        * WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.h:
     29        * WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm:
     30        (WebKit::WebFrameNetworkingContext::ensureWebsiteDataStoreSession):
     31        (WebKit::WebFrameNetworkingContext::ensurePrivateBrowsingSession): Deleted.
     32        * WebProcess/WebPage/WebPage.cpp:
     33        (WebKit::WebPage::setSessionID):
     34        * WebProcess/WebProcess.cpp:
     35        (WebKit::WebProcess::ensurePrivateBrowsingSession): Deleted.
     36        * WebProcess/WebProcess.h:
     37        * WebProcess/WebProcess.messages.in:
     38
    1392017-11-13  Alex Christensen  <achristensen@webkit.org>
    240

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

    r224267 r224791  
    469469void NetworkConnectionToWebProcess::ensureLegacyPrivateBrowsingSession()
    470470{
    471     NetworkProcess::singleton().ensurePrivateBrowsingSession({ { }, { }, { }, { }, WebsiteDataStore::defaultCacheStoragePerOriginQuota, { }, { PAL::SessionID::legacyPrivateSessionID(), { }, { }, AllowsCellularAccess::Yes }});
     471    NetworkProcess::singleton().addWebsiteDataStore(WebsiteDataStoreParameters::legacyPrivateSessionParameters());
    472472}
    473473

  • trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp

    r224371 r224791  
    239239    // FIXME: instead of handling this here, a message should be sent later (scales to multiple sessions)
    240240    if (parameters.privateBrowsingEnabled)
    241         RemoteNetworkingContext::ensurePrivateBrowsingSession({ { }, { }, { }, { }, WebsiteDataStore::defaultCacheStoragePerOriginQuota, { }, { PAL::SessionID::legacyPrivateSessionID(), { }, { },  AllowsCellularAccess::Yes }});
     241        RemoteNetworkingContext::ensureWebsiteDataStoreSession(WebsiteDataStoreParameters::legacyPrivateSessionParameters());
    242242
    243243    if (parameters.shouldUseTestingNetworkSession)
    … …  
    296296        ASSERT_NOT_REACHED();
    297297#endif
    298 }
    299 
    300 void NetworkProcess::ensurePrivateBrowsingSession(WebsiteDataStoreParameters&& parameters)
    301 {
    302     RemoteNetworkingContext::ensurePrivateBrowsingSession(WTFMove(parameters));
    303298}
    304299

  • trunk/Source/WebKit/NetworkProcess/NetworkProcess.h

    r223730 r224791  
    133133    void prefetchDNS(const String&);
    134134
    135     void ensurePrivateBrowsingSession(WebsiteDataStoreParameters&&);
     135    void addWebsiteDataStore(WebsiteDataStoreParameters&&);
    136136
    137137    void grantSandboxExtensionsToStorageProcessForBlobs(const Vector<String>& filenames, Function<void ()>&& completionHandler);
    … …  
    188188    void initializeNetworkProcess(NetworkProcessCreationParameters&&);
    189189    void createNetworkConnectionToWebProcess();
    190     void addWebsiteDataStore(WebsiteDataStoreParameters&&);
    191190    void destroySession(PAL::SessionID);
    192191

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

    r223730 r224791  
    3636    ClearCachedCredentials()
    3737
    38     EnsurePrivateBrowsingSession(struct WebKit::WebsiteDataStoreParameters websiteDataStoreParameters)
    3938    AddWebsiteDataStore(struct WebKit::WebsiteDataStoreParameters websiteDataStoreParameters);
    4039    DestroySession(PAL::SessionID sessionID)

  • trunk/Source/WebKit/NetworkProcess/RemoteNetworkingContext.h

    r220887 r224791  
    4444
    4545    // FIXME: Remove platform-specific code and use SessionTracker.
    46     static void ensurePrivateBrowsingSession(WebsiteDataStoreParameters&&);
    4746    static void ensureWebsiteDataStoreSession(WebsiteDataStoreParameters&&);
    4847

  • trunk/Source/WebKit/NetworkProcess/mac/RemoteNetworkingContext.mm

    r223791 r224791  
    8282}
    8383
    84 void RemoteNetworkingContext::ensurePrivateBrowsingSession(WebsiteDataStoreParameters&& parameters)
    85 {
    86     auto sessionID = parameters.networkSessionParameters.sessionID;
    87     ASSERT(sessionID.isEphemeral());
    88 
    89     if (NetworkStorageSession::storageSession(sessionID))
    90         return;
    91 
    92     String base;
    93     if (SessionTracker::getIdentifierBase().isNull())
    94         base = [[NSBundle mainBundle] bundleIdentifier];
    95     else
    96         base = SessionTracker::getIdentifierBase();
    97 
    98     NetworkStorageSession::ensurePrivateBrowsingSession(sessionID, base + '.' + String::number(sessionID.sessionID()));
    99 
    100     auto* session = NetworkStorageSession::storageSession(sessionID);
    101     for (const auto& cookie : parameters.pendingCookies)
    102         session->setCookie(cookie);
    103 
    104 #if USE(NETWORK_SESSION)
    105     parameters.networkSessionParameters.legacyCustomProtocolManager = NetworkProcess::singleton().supplement<LegacyCustomProtocolManager>();
    106     SessionTracker::setSession(sessionID, NetworkSession::create(WTFMove(parameters.networkSessionParameters)));
    107 #endif
    108 }
    109 
    11084void RemoteNetworkingContext::ensureWebsiteDataStoreSession(WebsiteDataStoreParameters&& parameters)
    11185{
    … …  
    12094        base = SessionTracker::getIdentifierBase();
    12195
    122     SandboxExtension::consumePermanently(parameters.cookieStoragePathExtensionHandle);
     96    if (!sessionID.isEphemeral()) {
     97        bool result = SandboxExtension::consumePermanently(parameters.cookieStoragePathExtensionHandle);
     98        ASSERT_UNUSED(result, result);
     99    }
    123100
    124101    RetainPtr<CFHTTPCookieStorageRef> uiProcessCookieStorage;

  • trunk/Source/WebKit/NetworkProcess/soup/RemoteNetworkingContextSoup.cpp

    r223791 r224791  
    4949}
    5050
    51 void RemoteNetworkingContext::ensurePrivateBrowsingSession(WebsiteDataStoreParameters&& parameters)
     51void RemoteNetworkingContext::ensureWebsiteDataStoreSession(WebsiteDataStoreParameters&& parameters)
    5252{
    5353    auto sessionID = parameters.networkSessionParameters.sessionID;
    54     ASSERT(sessionID.isEphemeral());
    55 
    5654    if (NetworkStorageSession::storageSession(sessionID))
    5755        return;
    5856
    59     NetworkStorageSession::ensurePrivateBrowsingSession(sessionID, String::number(sessionID.sessionID()));
     57    NetworkStorageSession::ensureSession(sessionID, String::number(sessionID.sessionID()));
    6058    SessionTracker::setSession(sessionID, NetworkSession::create(WTFMove(parameters.networkSessionParameters)));
    61 }
    62 
    63 void RemoteNetworkingContext::ensureWebsiteDataStoreSession(WebsiteDataStoreParameters&&)
    64 {
    65     // FIXME: Implement.
    6659}
    6760

  • trunk/Source/WebKit/Shared/WebsiteDataStoreParameters.cpp

    r223791 r224791  
    2828
    2929#include "WebCoreArgumentCoders.h"
     30#include "WebsiteDataStore.h"
    3031
    3132namespace WebKit {
    … …  
    7879}
    7980
     81WebsiteDataStoreParameters WebsiteDataStoreParameters::legacyPrivateSessionParameters()
     82{
     83    return { { }, { }, { }, { }, WebsiteDataStore::defaultCacheStoragePerOriginQuota, { }, { PAL::SessionID::legacyPrivateSessionID(), { }, { }, { }}};
     84}
    8085
    8186} // namespace WebKit

  • trunk/Source/WebKit/Shared/WebsiteDataStoreParameters.h

    r223791 r224791  
    4444    WebsiteDataStoreParameters(WebsiteDataStoreParameters&&) = default;
    4545    ~WebsiteDataStoreParameters();
     46    static WebsiteDataStoreParameters legacyPrivateSessionParameters();
    4647   
    4748    void encode(IPC::Encoder&) const;

  • trunk/Source/WebKit/UIProcess/WebProcessPool.cpp

    r224462 r224791  
    635635    if (networkProcess()) {
    636636        if (privateBrowsingEnabled)
    637             networkProcess()->send(Messages::NetworkProcess::EnsurePrivateBrowsingSession({ { }, { }, { }, { }, WebsiteDataStore::defaultCacheStoragePerOriginQuota, { }, { PAL::SessionID::legacyPrivateSessionID(), { }, { }, AllowsCellularAccess::Yes }}), 0);
     637            networkProcess()->send(Messages::NetworkProcess::AddWebsiteDataStore(WebsiteDataStoreParameters::legacyPrivateSessionParameters()), 0);
    638638        else
    639639            networkProcess()->send(Messages::NetworkProcess::DestroySession(PAL::SessionID::legacyPrivateSessionID()), 0);
    … …  
    641641
    642642    if (privateBrowsingEnabled)
    643         sendToAllProcesses(Messages::WebProcess::EnsurePrivateBrowsingSession(PAL::SessionID::legacyPrivateSessionID()));
     643        sendToAllProcesses(Messages::WebProcess::AddWebsiteDataStore(WebsiteDataStoreParameters::legacyPrivateSessionParameters()));
    644644    else
    645645        sendToAllProcesses(Messages::WebProcess::DestroySession(PAL::SessionID::legacyPrivateSessionID()));
    … …  
    832832
    833833    if (WebPreferences::anyPagesAreUsingPrivateBrowsing())
    834         process.send(Messages::WebProcess::EnsurePrivateBrowsingSession(PAL::SessionID::legacyPrivateSessionID()), 0);
     834        process.send(Messages::WebProcess::AddWebsiteDataStore(WebsiteDataStoreParameters::legacyPrivateSessionParameters()), 0);
    835835
    836836    if (m_automationSession)
    … …  
    10221022    auto sessionID = page.sessionID();
    10231023    if (sessionID.isEphemeral()) {
    1024         // FIXME: Merge NetworkProcess::EnsurePrivateBrowsingSession and NetworkProcess::AddWebsiteDataStore into one message type.
    1025         // They do basically the same thing.
    10261024        ASSERT(page.websiteDataStore().parameters().networkSessionParameters.sessionID == sessionID);
    1027         sendToNetworkingProcess(Messages::NetworkProcess::EnsurePrivateBrowsingSession(page.websiteDataStore().parameters()));
    1028         page.process().send(Messages::WebProcess::EnsurePrivateBrowsingSession(sessionID), 0);
     1025        sendToNetworkingProcess(Messages::NetworkProcess::AddWebsiteDataStore(page.websiteDataStore().parameters()));
     1026        page.process().send(Messages::WebProcess::AddWebsiteDataStore({{ }, { }, { }, { }, { }, { }, { sessionID, { }, { }, { }}}), 0);
    10291027    } else if (sessionID != PAL::SessionID::defaultSessionID()) {
    10301028        sendToNetworkingProcess(Messages::NetworkProcess::AddWebsiteDataStore(page.websiteDataStore().parameters()));

  • trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp

    r223791 r224791  
    322322    if (enabled) {
    323323        WebProcess::singleton().ensureLegacyPrivateBrowsingSessionInNetworkProcess();
    324         WebFrameNetworkingContext::ensurePrivateBrowsingSession({ { }, { }, { }, { }, { }, { }, { PAL::SessionID::legacyPrivateSessionID(), { }, { }, AllowsCellularAccess::Yes }});
     324        WebFrameNetworkingContext::ensureWebsiteDataStoreSession({ { }, { }, { }, { }, { }, { }, { PAL::SessionID::legacyPrivateSessionID(), { }, { }, AllowsCellularAccess::Yes }});
    325325    } else
    326326        SessionTracker::destroySession(PAL::SessionID::legacyPrivateSessionID());

  • trunk/Source/WebKit/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.h

    r223791 r224791  
    4343
    4444    // FIXME: remove platform-specific code and use SessionTracker
    45     static void ensurePrivateBrowsingSession(WebsiteDataStoreParameters&&);
    4645    static void ensureWebsiteDataStoreSession(WebsiteDataStoreParameters&&);
    4746

  • trunk/Source/WebKit/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm

    r223791 r224791  
    4646
    4747namespace WebKit {
    48    
    49 void WebFrameNetworkingContext::ensurePrivateBrowsingSession(WebsiteDataStoreParameters&& parameters)
    50 {
    51     auto sessionID = parameters.networkSessionParameters.sessionID;
    52     ASSERT(sessionID.isEphemeral());
    53 
    54     if (WebCore::NetworkStorageSession::storageSession(sessionID))
    55         return;
    56 
    57     String base;
    58     if (SessionTracker::getIdentifierBase().isNull())
    59         base = [[NSBundle mainBundle] bundleIdentifier];
    60     else
    61         base = SessionTracker::getIdentifierBase();
    62 
    63     NetworkStorageSession::ensurePrivateBrowsingSession(sessionID, base + '.' + String::number(sessionID.sessionID()));
    64 #if USE(NETWORK_SESSION)
    65     SessionTracker::setSession(sessionID, NetworkSession::create(WTFMove(parameters.networkSessionParameters)));
    66 #endif
    67 }
    6848
    6949void WebFrameNetworkingContext::ensureWebsiteDataStoreSession(WebsiteDataStoreParameters&& parameters)
    … …  
    7959        base = SessionTracker::getIdentifierBase();
    8060
    81     SandboxExtension::consumePermanently(parameters.cookieStoragePathExtensionHandle);
     61    if (!sessionID.isEphemeral()) {
     62        bool result = SandboxExtension::consumePermanently(parameters.cookieStoragePathExtensionHandle);
     63        ASSERT_UNUSED(result, result);
     64    }
    8265
    83     RetainPtr<CFHTTPCookieStorageRef> uiProcessCookieStorage = cookieStorageFromIdentifyingData(parameters.uiProcessCookieStorageIdentifier);
     66    RetainPtr<CFHTTPCookieStorageRef> uiProcessCookieStorage;
     67    if (!sessionID.isEphemeral())
     68        uiProcessCookieStorage = cookieStorageFromIdentifyingData(parameters.uiProcessCookieStorageIdentifier);
     69    else
     70        ASSERT(parameters.uiProcessCookieStorageIdentifier.isEmpty());
    8471
    8572    NetworkStorageSession::ensureSession(sessionID, base + '.' + String::number(sessionID.sessionID()), WTFMove(uiProcessCookieStorage));

  • trunk/Source/WebKit/WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp

    r223791 r224791  
    4444namespace WebKit {
    4545
    46 void WebFrameNetworkingContext::ensurePrivateBrowsingSession(WebsiteDataStoreParameters&& parameters)
     46void WebFrameNetworkingContext::ensureWebsiteDataStoreSession(WebsiteDataStoreParameters&& parameters)
    4747{
    4848    auto sessionID = parameters.networkSessionParameters.sessionID;
    4949    ASSERT(RunLoop::isMain());
    50     ASSERT(sessionID.isEphemeral());
    5150
    5251    if (NetworkStorageSession::storageSession(sessionID))
    5352        return;
    5453
    55     NetworkStorageSession::ensurePrivateBrowsingSession(sessionID, String::number(sessionID.sessionID()));
     54    NetworkStorageSession::ensureSession(sessionID, String::number(sessionID.sessionID()));
    5655    SessionTracker::setSession(sessionID, NetworkSession::create(WTFMove(parameters.networkSessionParameters)));
    57 }
    58 
    59 void WebFrameNetworkingContext::ensureWebsiteDataStoreSession(WebsiteDataStoreParameters&&)
    60 {
    61     // FIXME: Implement
    6256}
    6357

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

    r224755 r224791  
    122122#include "WebUserMediaClient.h"
    123123#include "WebValidationMessageClient.h"
     124#include "WebsiteDataStoreParameters.h"
    124125#include <JavaScriptCore/APICast.h>
    125126#include <WebCore/ApplicationCacheStorage.h>
    … …  
    27412742{
    27422743    if (sessionID.isEphemeral())
    2743         WebProcess::singleton().ensurePrivateBrowsingSession(sessionID);
     2744        WebProcess::singleton().addWebsiteDataStore({{ }, { }, { }, { }, { }, { }, { sessionID, { }, { }, { }}});
    27442745    m_page->setSessionID(sessionID);
    27452746}

  • trunk/Source/WebKit/WebProcess/WebProcess.cpp

    r224041 r224791  
    516516}
    517517
    518 void WebProcess::ensurePrivateBrowsingSession(PAL::SessionID sessionID)
    519 {
    520     WebFrameNetworkingContext::ensurePrivateBrowsingSession({ { }, { }, { }, { }, { }, { }, { sessionID, { }, { }, AllowsCellularAccess::Yes }});
    521 }
    522 
    523518void WebProcess::addWebsiteDataStore(WebsiteDataStoreParameters&& parameters)
    524519{

  • trunk/Source/WebKit/WebProcess/WebProcess.h

    r224041 r224791  
    179179    void setCacheModel(uint32_t);
    180180
    181     void ensurePrivateBrowsingSession(PAL::SessionID);
    182181    void ensureLegacyPrivateBrowsingSessionInNetworkProcess();
    183182    void addWebsiteDataStore(WebsiteDataStoreParameters&&);

  • trunk/Source/WebKit/WebProcess/WebProcess.messages.in

    r223981 r224791  
    4848    ClearCachedCredentials()
    4949
    50     EnsurePrivateBrowsingSession(PAL::SessionID sessionID)
    5150    AddWebsiteDataStore(struct WebKit::WebsiteDataStoreParameters websiteDataStoreParameters);
    5251    DestroySession(PAL::SessionID sessionID)

  • trunk/Source/WebKitLegacy/mac/ChangeLog

    r224787 r224791  
     12017-11-13  Alex Christensen  <achristensen@webkit.org>
     2
     3        Merge NetworkProcess::EnsurePrivateBrowsingSession and NetworkProcess::AddWebsiteDataStore into one message type
     4        https://bugs.webkit.org/show_bug.cgi?id=178751
     5
     6        Reviewed by Brady Eidson.
     7
     8        * WebCoreSupport/WebFrameNetworkingContext.mm:
     9        (WebFrameNetworkingContext::ensurePrivateBrowsingSession):
     10
    1112017-11-08  Keith Miller  <keith_miller@apple.com>
    212

  • trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameNetworkingContext.mm

    r220887 r224791  
    4747{
    4848    ASSERT(isMainThread());
    49     NetworkStorageSession::ensurePrivateBrowsingSession(PAL::SessionID::legacyPrivateSessionID(), [[NSBundle mainBundle] bundleIdentifier]);
     49    NetworkStorageSession::ensureSession(PAL::SessionID::legacyPrivateSessionID(), [[NSBundle mainBundle] bundleIdentifier]);
    5050    return *NetworkStorageSession::storageSession(PAL::SessionID::legacyPrivateSessionID());
    5151}

  • trunk/Source/WebKitLegacy/win/WebCoreSupport/WebFrameNetworkingContext.cpp

    r220857 r224791  
    8282        base = identifierBase();
    8383
    84     NetworkStorageSession::ensurePrivateBrowsingSession(PAL::SessionID::legacyPrivateSessionID(), base);
     84    NetworkStorageSession::ensureSession(PAL::SessionID::legacyPrivateSessionID(), base);
    8585
    8686#endif
Note: See TracChangeset for help on using the changeset viewer.