Changeset 238654 in webkit


Ignore:
Timestamp:
Nov 28, 2018, 6:18:37 PM (6 years ago)
Author:
achristensen@apple.com
Message:

Move loadThrottleLatency from NetworkProcessCreationParameters to NetworkSessionCreationParameters
​https://bugs.webkit.org/show_bug.cgi?id=192122

Reviewed by Dean Jackson.

This is part of an effort to reduce global variables in the NetworkProcess.

  • NetworkProcess/NetworkLoad.cpp:

(WebKit::NetworkLoad::NetworkLoad):
(WebKit::NetworkLoad::didReceiveResponse):

  • NetworkProcess/NetworkLoad.h:
  • NetworkProcess/NetworkProcess.cpp:

(WebKit::NetworkProcess::initializeNetworkProcess):

  • NetworkProcess/NetworkProcess.h:

(WebKit::NetworkProcess::loadThrottleLatency const): Deleted.

  • NetworkProcess/NetworkProcessCreationParameters.cpp:

(WebKit::NetworkProcessCreationParameters::encode const):
(WebKit::NetworkProcessCreationParameters::decode):

  • NetworkProcess/NetworkSession.h:

(WebKit::NetworkSession::loadThrottleLatency const):

  • NetworkProcess/NetworkSessionCreationParameters.cpp: Added.

(WebKit::NetworkSessionCreationParameters::privateSessionParameters):
(WebKit::NetworkSessionCreationParameters::encode const):
(WebKit::NetworkSessionCreationParameters::decode):

  • NetworkProcess/NetworkSessionCreationParameters.h:

(WebKit::NetworkSessionCreationParameters::encode const): Deleted.
(WebKit::NetworkSessionCreationParameters::decode): Deleted.

  • NetworkProcess/cocoa/NetworkSessionCocoa.h:
  • NetworkProcess/cocoa/NetworkSessionCocoa.mm:

(WebKit::NetworkSessionCocoa::NetworkSessionCocoa):

  • Shared/WebsiteDataStoreParameters.cpp:

(WebKit::WebsiteDataStoreParameters::privateSessionParameters):

  • Sources.txt:
  • UIProcess/Cocoa/WebProcessPoolCocoa.mm:

(WebKit::WebProcessPool::platformInitializeNetworkProcess):

  • UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm:

(WebKit::WebsiteDataStore::parameters):

  • WebKit.xcodeproj/project.pbxproj:
Location:
trunk/Source/WebKit
Files:
1 added
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r238653 r238654  
     12018-11-28  Alex Christensen  <achristensen@webkit.org>
     2
     3        Move loadThrottleLatency from NetworkProcessCreationParameters to NetworkSessionCreationParameters
     4        https://bugs.webkit.org/show_bug.cgi?id=192122
     5
     6        Reviewed by Dean Jackson.
     7
     8        This is part of an effort to reduce global variables in the NetworkProcess.
     9
     10        * NetworkProcess/NetworkLoad.cpp:
     11        (WebKit::NetworkLoad::NetworkLoad):
     12        (WebKit::NetworkLoad::didReceiveResponse):
     13        * NetworkProcess/NetworkLoad.h:
     14        * NetworkProcess/NetworkProcess.cpp:
     15        (WebKit::NetworkProcess::initializeNetworkProcess):
     16        * NetworkProcess/NetworkProcess.h:
     17        (WebKit::NetworkProcess::loadThrottleLatency const): Deleted.
     18        * NetworkProcess/NetworkProcessCreationParameters.cpp:
     19        (WebKit::NetworkProcessCreationParameters::encode const):
     20        (WebKit::NetworkProcessCreationParameters::decode):
     21        * NetworkProcess/NetworkSession.h:
     22        (WebKit::NetworkSession::loadThrottleLatency const):
     23        * NetworkProcess/NetworkSessionCreationParameters.cpp: Added.
     24        (WebKit::NetworkSessionCreationParameters::privateSessionParameters):
     25        (WebKit::NetworkSessionCreationParameters::encode const):
     26        (WebKit::NetworkSessionCreationParameters::decode):
     27        * NetworkProcess/NetworkSessionCreationParameters.h:
     28        (WebKit::NetworkSessionCreationParameters::encode const): Deleted.
     29        (WebKit::NetworkSessionCreationParameters::decode): Deleted.
     30        * NetworkProcess/cocoa/NetworkSessionCocoa.h:
     31        * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
     32        (WebKit::NetworkSessionCocoa::NetworkSessionCocoa):
     33        * Shared/WebsiteDataStoreParameters.cpp:
     34        (WebKit::WebsiteDataStoreParameters::privateSessionParameters):
     35        * Sources.txt:
     36        * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
     37        (WebKit::WebProcessPool::platformInitializeNetworkProcess):
     38        * UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm:
     39        (WebKit::WebsiteDataStore::parameters):
     40        * WebKit.xcodeproj/project.pbxproj:
     41
    1422018-11-15  Megan Gardner  <megan_gardner@apple.com>
    243

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

    r236463 r238654  
    7171    : m_client(client)
    7272    , m_parameters(WTFMove(parameters))
     73    , m_loadThrottleLatency(networkSession.loadThrottleLatency())
    7374    , m_currentRequest(m_parameters.request)
    7475{
    … …  
    269270    }
    270271
    271     auto delay = NetworkProcess::singleton().loadThrottleLatency();
    272     if (delay > 0_s) {
    273         m_throttle = std::make_unique<Throttle>(*this, delay, WTFMove(response), WTFMove(completionHandler));
     272    if (m_loadThrottleLatency > 0_s) {
     273        m_throttle = std::make_unique<Throttle>(*this, m_loadThrottleLatency, WTFMove(response), WTFMove(completionHandler));
    274274        return;
    275275    }

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

    r236463 r238654  
    9898    struct Throttle;
    9999    std::unique_ptr<Throttle> m_throttle;
     100    Seconds m_loadThrottleLatency;
    100101
    101102    WebCore::ResourceRequest m_currentRequest; // Updated on redirects.

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

    r238630 r238654  
    293293
    294294    m_suppressMemoryPressureHandler = parameters.shouldSuppressMemoryPressureHandler;
    295     m_loadThrottleLatency = parameters.loadThrottleLatency;
    296295    if (!m_suppressMemoryPressureHandler) {
    297296        auto& memoryPressureHandler = MemoryPressureHandler::singleton();

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

    r238630 r238654  
    170170#endif
    171171
    172     Seconds loadThrottleLatency() const { return m_loadThrottleLatency; }
    173 
    174172    using CacheStorageParametersCallback = CompletionHandler<void(const String&, uint64_t quota)>;
    175173    void cacheStorageParameters(PAL::SessionID, CacheStorageParametersCallback&&);
    … …  
    358356    bool m_diskCacheIsDisabledForTesting;
    359357    bool m_canHandleHTTPSServerTrustEvaluation;
    360     Seconds m_loadThrottleLatency;
    361358
    362359    RefPtr<NetworkCache::Cache> m_cache;

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

    r238630 r238654  
    6666    encoder << shouldSuppressMemoryPressureHandler;
    6767    encoder << shouldUseTestingNetworkSession;
    68     encoder << loadThrottleLatency;
    6968    encoder << urlSchemesRegisteredForCustomProtocols;
    7069    encoder << presentingApplicationPID;
    … …  
    182181    if (!decoder.decode(result.shouldUseTestingNetworkSession))
    183182        return false;
    184     if (!decoder.decode(result.loadThrottleLatency))
    185         return false;
    186183    if (!decoder.decode(result.urlSchemesRegisteredForCustomProtocols))
    187184        return false;

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

    r238630 r238654  
    3030#include <wtf/Ref.h>
    3131#include <wtf/RefCounted.h>
     32#include <wtf/Seconds.h>
    3233
    3334namespace WebCore {
    … …  
    4950    virtual void clearCredentials() { };
    5051    virtual bool shouldLogCookieInformation() const { return false; }
     52    virtual Seconds loadThrottleLatency() const { return { }; }
    5153
    5254    PAL::SessionID sessionID() const { return m_sessionID; }

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

    r238630 r238654  
    2626#pragma once
    2727
    28 #include "ArgumentCoders.h"
    2928#include <pal/SessionID.h>
     29#include <wtf/Seconds.h>
    3030#include <wtf/text/WTFString.h>
    3131
    32 #if PLATFORM(COCOA)
    33 #include "ArgumentCodersCF.h"
    34 #endif
    35 
    3632#if USE(CURL)
    37 #include "WebCoreArgumentCoders.h"
    3833#include <WebCore/CurlProxySettings.h>
    3934#endif
    4035
     36namespace IPC {
     37class Encoder;
     38class Decoder;
     39}
     40
    4141namespace WebKit {
    4242
    43 class LegacyCustomProtocolManager;
    44 
    45 enum class AllowsCellularAccess { No, Yes };
     43enum class AllowsCellularAccess : bool { No, Yes };
    4644   
    4745struct NetworkSessionCreationParameters {
    4846    void encode(IPC::Encoder&) const;
    4947    static std::optional<NetworkSessionCreationParameters> decode(IPC::Decoder&);
     48    static NetworkSessionCreationParameters privateSessionParameters(const PAL::SessionID&);
    5049   
    5150    PAL::SessionID sessionID { PAL::SessionID::defaultSessionID() };
    … …  
    5756    String sourceApplicationSecondaryIdentifier;
    5857    bool shouldLogCookieInformation { false };
     58    Seconds loadThrottleLatency;
    5959#endif
    6060#if USE(CURL)
    … …  
    6363};
    6464
    65 inline void NetworkSessionCreationParameters::encode(IPC::Encoder& encoder) const
    66 {
    67     encoder << sessionID;
    68     encoder << boundInterfaceIdentifier;
    69     encoder << allowsCellularAccess;
    70 #if PLATFORM(COCOA)
    71     IPC::encode(encoder, proxyConfiguration.get());
    72     encoder << sourceApplicationBundleIdentifier;
    73     encoder << sourceApplicationSecondaryIdentifier;
    74     encoder << shouldLogCookieInformation;
    75 #endif
    76 #if USE(CURL)
    77     encoder << proxySettings;
    78 #endif
    79 }
    80 
    81 inline std::optional<NetworkSessionCreationParameters> NetworkSessionCreationParameters::decode(IPC::Decoder& decoder)
    82 {
    83     PAL::SessionID sessionID;
    84     if (!decoder.decode(sessionID))
    85         return std::nullopt;
    86 
    87     std::optional<String> boundInterfaceIdentifier;
    88     decoder >> boundInterfaceIdentifier;
    89     if (!boundInterfaceIdentifier)
    90         return std::nullopt;
    91 
    92     std::optional<AllowsCellularAccess> allowsCellularAccess;
    93     decoder >> allowsCellularAccess;
    94     if (!allowsCellularAccess)
    95         return std::nullopt;
    96 
    97 #if PLATFORM(COCOA)
    98     RetainPtr<CFDictionaryRef> proxyConfiguration;
    99     if (!IPC::decode(decoder, proxyConfiguration))
    100         return std::nullopt;
    101    
    102     std::optional<String> sourceApplicationBundleIdentifier;
    103     decoder >> sourceApplicationBundleIdentifier;
    104     if (!sourceApplicationBundleIdentifier)
    105         return std::nullopt;
    106    
    107     std::optional<String> sourceApplicationSecondaryIdentifier;
    108     decoder >> sourceApplicationSecondaryIdentifier;
    109     if (!sourceApplicationSecondaryIdentifier)
    110         return std::nullopt;
    111    
    112     std::optional<bool> shouldLogCookieInformation;
    113     decoder >> shouldLogCookieInformation;
    114     if (!shouldLogCookieInformation)
    115         return std::nullopt;
    116 #endif
    117 
    118 #if USE(CURL)
    119     std::optional<WebCore::CurlProxySettings> proxySettings;
    120     decoder >> proxySettings;
    121     if (!proxySettings)
    122         return std::nullopt;
    123 #endif
    124 
    125     return {{
    126         sessionID
    127         , WTFMove(*boundInterfaceIdentifier)
    128         , WTFMove(*allowsCellularAccess)
    129 #if PLATFORM(COCOA)
    130         , WTFMove(proxyConfiguration)
    131         , WTFMove(*sourceApplicationBundleIdentifier)
    132         , WTFMove(*sourceApplicationSecondaryIdentifier)
    133         , WTFMove(*shouldLogCookieInformation)
    134 #endif
    135 #if USE(CURL)
    136         , WTFMove(*proxySettings)
    137 #endif
    138     }};
    139 }
    140 
    14165} // namespace WebKit
    142 
    143 namespace WTF {
    144 template<> struct EnumTraits<WebKit::AllowsCellularAccess> {
    145     using values = EnumValues<
    146         WebKit::AllowsCellularAccess,
    147         WebKit::AllowsCellularAccess::No,
    148         WebKit::AllowsCellularAccess::Yes
    149     >;
    150 };
    151 }

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

    r238630 r238654  
    7272    void clearCredentials() override;
    7373    bool shouldLogCookieInformation() const override { return m_shouldLogCookieInformation; }
     74    Seconds loadThrottleLatency() const override { return m_loadThrottleLatency; }
    7475
    7576    HashMap<NetworkDataTaskCocoa::TaskIdentifier, NetworkDataTaskCocoa*> m_dataTaskMapWithCredentials;
    … …  
    8586    RetainPtr<CFDictionaryRef> m_proxyConfiguration;
    8687    bool m_shouldLogCookieInformation { false };
     88    Seconds m_loadThrottleLatency;
    8789
    8890    String m_sourceApplicationBundleIdentifier;

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

    r238630 r238654  
    646646    , m_proxyConfiguration(parameters.proxyConfiguration)
    647647    , m_shouldLogCookieInformation(parameters.shouldLogCookieInformation)
     648    , m_loadThrottleLatency(parameters.loadThrottleLatency)
    648649{
    649650    ASSERT(hasProcessPrivilege(ProcessPrivilege::CanAccessRawCookies));

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

    r236477 r238654  
    114114{
    115115    ASSERT(sessionID.isEphemeral());
    116     return { { }, { }, { }, { sessionID, { }, AllowsCellularAccess::Yes
    117 #if PLATFORM(COCOA)
    118         , nullptr , { } , { }
    119 #endif
    120         }
     116    return { { }, { }, { }, NetworkSessionCreationParameters::privateSessionParameters(sessionID)
    121117#if ENABLE(INDEXED_DATABASE)
    122118        , { }, { }

  • trunk/Source/WebKit/Sources.txt

    r238625 r238654  
    3636NetworkProcess/NetworkResourceLoader.cpp
    3737NetworkProcess/NetworkSession.cpp
     38NetworkProcess/NetworkSessionCreationParameters.cpp
    3839NetworkProcess/NetworkSocketStream.cpp
    3940NetworkProcess/PingLoad.cpp

  • trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm

    r238630 r238654  
    7676
    7777static NSString * const WebKitSuppressMemoryPressureHandlerDefaultsKey = @"WebKitSuppressMemoryPressureHandler";
    78 static NSString * const WebKitNetworkLoadThrottleLatencyMillisecondsDefaultsKey = @"WebKitNetworkLoadThrottleLatencyMilliseconds";
    7978
    8079#if ENABLE(RESOURCE_LOAD_STATISTICS) && !RELEASE_LOG_DISABLED
    … …  
    284283
    285284    parameters.shouldSuppressMemoryPressureHandler = [defaults boolForKey:WebKitSuppressMemoryPressureHandlerDefaultsKey];
    286     parameters.loadThrottleLatency = Seconds { [defaults integerForKey:WebKitNetworkLoadThrottleLatencyMillisecondsDefaultsKey] / 1000. };
    287285
    288286#if PLATFORM(MAC)

  • trunk/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm

    r238630 r238654  
    5252}
    5353
     54static NSString * const WebKitNetworkLoadThrottleLatencyMillisecondsDefaultsKey = @"WebKitNetworkLoadThrottleLatencyMilliseconds";
     55
    5456WebsiteDataStoreParameters WebsiteDataStore::parameters()
    5557{
    … …  
    5860    resolveDirectoriesIfNecessary();
    5961
     62    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
    6063#if ENABLE(RESOURCE_LOAD_STATISTICS) && !RELEASE_LOG_DISABLED
    6164    static NSString * const WebKitLogCookieInformationDefaultsKey = @"WebKitLogCookieInformation";
    62     bool shouldLogCookieInformation = [[NSUserDefaults standardUserDefaults] boolForKey:WebKitLogCookieInformationDefaultsKey];
     65    bool shouldLogCookieInformation = [defaults boolForKey:WebKitLogCookieInformationDefaultsKey];
    6366#else
    6467    bool shouldLogCookieInformation = false;
    … …  
    7477        m_configuration.sourceApplicationSecondaryIdentifier,
    7578        shouldLogCookieInformation,
     79        Seconds { [defaults integerForKey:WebKitNetworkLoadThrottleLatencyMillisecondsDefaultsKey] / 1000. }
    7680    };
    7781

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

    r238625 r238654  
    34563456                5C84CF901F96AC4E00B6705A /* NetworkSessionCreationParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkSessionCreationParameters.h; sourceTree = "<group>"; };
    34573457                5C85C7861C3F23C50061A4FA /* PendingDownload.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PendingDownload.cpp; sourceTree = "<group>"; };
     3458                5C89DF5621AF61FF004645E8 /* NetworkSessionCreationParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkSessionCreationParameters.cpp; sourceTree = "<group>"; };
    34583459                5C8BC796218CB58A00813886 /* SafeBrowsing.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = SafeBrowsing.xcassets; path = Resources/SafeBrowsing.xcassets; sourceTree = "<group>"; };
    34593460                5C8DD37C1FE4501100F2A556 /* APIWebsitePolicies.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIWebsitePolicies.h; sourceTree = "<group>"; };
    … …  
    64356436                                532159521DBAE6FC0054AA3C /* NetworkSession.cpp */,
    64366437                                5C20CB9E1BB0DD1800895BB1 /* NetworkSession.h */,
     6438                                5C89DF5621AF61FF004645E8 /* NetworkSessionCreationParameters.cpp */,
    64376439                                5C84CF901F96AC4E00B6705A /* NetworkSessionCreationParameters.h */,
    64386440                                5C0B177D1E7C886700E9123C /* NetworkSocketStream.cpp */,
Note: See TracChangeset for help on using the changeset viewer.