Changeset 252368 in webkit


Ignore:
Timestamp:
Nov 12, 2019, 9:30:07 AM (5 years ago)
Author:
achristensen@apple.com
Message:

Revert remainder of r251676
​https://bugs.webkit.org/show_bug.cgi?id=203066
<rdar://problem/57115922>

  • NetworkProcess/NetworkProcessCreationParameters.cpp:

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

  • NetworkProcess/NetworkProcessCreationParameters.h:
  • NetworkProcess/cocoa/NetworkProcessCocoa.mm:

(WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):

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

(WebKit::globalCTDataConnectionServiceType):
(WebKit::NetworkSessionCocoa::setCTDataConnectionServiceType):
(WebKit::NetworkSessionCocoa::dataConnectionServiceType const):
(WebKit::NetworkSessionCocoa::NetworkSessionCocoa):

  • UIProcess/API/APIProcessPoolConfiguration.h:
  • UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h:
  • UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm:

(-[_WKProcessPoolConfiguration CTDataConnectionServiceType]):
(-[_WKProcessPoolConfiguration setCTDataConnectionServiceType:]):

  • UIProcess/Cocoa/WebProcessPoolCocoa.mm:

(WebKit::WebProcessPool::platformInitializeNetworkProcess):

  • UIProcess/ios/WebPageProxyIOS.mm:

(WebKit::WebPageProxy::paymentCoordinatorCTDataConnectionServiceType):

Location:
trunk/Source/WebKit
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r252367 r252368  
     12019-11-12  Alex Christensen  <achristensen@webkit.org>
     2
     3        Revert remainder of r251676
     4        https://bugs.webkit.org/show_bug.cgi?id=203066
     5        <rdar://problem/57115922>
     6
     7        * NetworkProcess/NetworkProcessCreationParameters.cpp:
     8        (WebKit::NetworkProcessCreationParameters::encode const):
     9        (WebKit::NetworkProcessCreationParameters::decode):
     10        * NetworkProcess/NetworkProcessCreationParameters.h:
     11        * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
     12        (WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
     13        * NetworkProcess/cocoa/NetworkSessionCocoa.h:
     14        * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
     15        (WebKit::globalCTDataConnectionServiceType):
     16        (WebKit::NetworkSessionCocoa::setCTDataConnectionServiceType):
     17        (WebKit::NetworkSessionCocoa::dataConnectionServiceType const):
     18        (WebKit::NetworkSessionCocoa::NetworkSessionCocoa):
     19        * UIProcess/API/APIProcessPoolConfiguration.h:
     20        * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h:
     21        * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm:
     22        (-[_WKProcessPoolConfiguration CTDataConnectionServiceType]):
     23        (-[_WKProcessPoolConfiguration setCTDataConnectionServiceType:]):
     24        * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
     25        (WebKit::WebProcessPool::platformInitializeNetworkProcess):
     26        * UIProcess/ios/WebPageProxyIOS.mm:
     27        (WebKit::WebPageProxy::paymentCoordinatorCTDataConnectionServiceType):
     28
    1292019-11-12  Megan Gardner  <megan_gardner@apple.com>
    230

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

    r252364 r252368  
    5454    encoder << uiProcessBundleIdentifier;
    5555    encoder << uiProcessSDKVersion;
     56#if PLATFORM(IOS_FAMILY)
     57    encoder << ctDataConnectionServiceType;
     58#endif
    5659    IPC::encode(encoder, networkATSContext.get());
    5760    encoder << storageAccessAPIEnabled;
    … …  
    118121    if (!decoder.decode(result.uiProcessSDKVersion))
    119122        return false;
     123#if PLATFORM(IOS_FAMILY)
     124    if (!decoder.decode(result.ctDataConnectionServiceType))
     125        return false;
     126#endif
    120127    if (!IPC::decode(decoder, result.networkATSContext))
    121128        return false;

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

    r252364 r252368  
    6969    String uiProcessBundleIdentifier;
    7070    uint32_t uiProcessSDKVersion { 0 };
     71#if PLATFORM(IOS_FAMILY)
     72    String ctDataConnectionServiceType;
     73#endif
    7174    RetainPtr<CFDataRef> networkATSContext;
    7275    bool storageAccessAPIEnabled;

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

    r252364 r252368  
    9696    m_uiProcessBundleIdentifier = parameters.uiProcessBundleIdentifier;
    9797
     98#if PLATFORM(IOS_FAMILY)
     99    NetworkSessionCocoa::setCTDataConnectionServiceType(parameters.ctDataConnectionServiceType);
     100#endif
     101   
    98102    initializeNetworkSettings();
    99103

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

    r252185 r252368  
    7575    const String& sourceApplicationSecondaryIdentifier() const;
    7676#if PLATFORM(IOS_FAMILY)
    77     const String& dataConnectionServiceType() const { return m_dataConnectionServiceType; }
     77    static void setCTDataConnectionServiceType(const String&);
     78    const String& dataConnectionServiceType() const;
    7879#endif
    7980

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

    r252364 r252368  
    969969}
    970970
     971#if PLATFORM(IOS_FAMILY)
     972static String& globalCTDataConnectionServiceType()
     973{
     974    static NeverDestroyed<String> ctDataConnectionServiceType;
     975    return ctDataConnectionServiceType.get();
     976}
     977
     978void NetworkSessionCocoa::setCTDataConnectionServiceType(const String& type)
     979{
     980    ASSERT(!sessionsCreated);
     981    globalCTDataConnectionServiceType() = type;
     982}
     983
     984const String& NetworkSessionCocoa::dataConnectionServiceType() const
     985{
     986    if (!globalCTDataConnectionServiceType().isEmpty())
     987        return globalCTDataConnectionServiceType();
     988    return m_dataConnectionServiceType;
     989}
     990#endif
     991
    971992std::unique_ptr<NetworkSession> NetworkSessionCocoa::create(NetworkProcess& networkProcess, NetworkSessionCreationParameters&& parameters)
    972993{
    … …  
    10571078
    10581079#if PLATFORM(IOS_FAMILY)
    1059     if (!m_dataConnectionServiceType.isEmpty())
     1080    if (!globalCTDataConnectionServiceType().isEmpty())
     1081        configuration._CTDataConnectionServiceType = globalCTDataConnectionServiceType();
     1082    else if (!m_dataConnectionServiceType.isEmpty())
    10601083        configuration._CTDataConnectionServiceType = m_dataConnectionServiceType;
    10611084#endif

  • trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h

    r252364 r252368  
    119119    void setJITEnabled(bool enabled) { m_isJITEnabled = enabled; }
    120120
     121#if PLATFORM(IOS_FAMILY)
     122    const WTF::String& ctDataConnectionServiceType() const { return m_ctDataConnectionServiceType; }
     123    void setCTDataConnectionServiceType(const WTF::String& ctDataConnectionServiceType) { m_ctDataConnectionServiceType = ctDataConnectionServiceType; }
     124#endif
     125
    121126    ProcessID presentingApplicationPID() const { return m_presentingApplicationPID; }
    122127    void setPresentingApplicationPID(ProcessID pid) { m_presentingApplicationPID = pid; }

  • trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h

    r252364 r252368  
    5858@property (nonatomic) BOOL shouldCaptureAudioInUIProcess WK_API_AVAILABLE(macos(10.13), ios(11.0));
    5959#if TARGET_OS_IPHONE
     60@property (nonatomic, nullable, copy) NSString *CTDataConnectionServiceType WK_API_DEPRECATED_WITH_REPLACEMENT("_WKWebsiteDataStoreConfiguration.dataConnectionServiceType", ios(10.3, WK_IOS_TBA));
    6061@property (nonatomic) BOOL alwaysRunsAtBackgroundPriority WK_API_AVAILABLE(ios(10.3));
    6162@property (nonatomic) BOOL shouldTakeUIBackgroundAssertion WK_API_AVAILABLE(ios(11.0));

  • trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm

    r252364 r252368  
    367367
    368368#if PLATFORM(IOS_FAMILY)
     369- (NSString *)CTDataConnectionServiceType
     370{
     371    return _processPoolConfiguration->ctDataConnectionServiceType();
     372}
     373
     374- (void)setCTDataConnectionServiceType:(NSString *)ctDataConnectionServiceType
     375{
     376    _processPoolConfiguration->setCTDataConnectionServiceType(ctDataConnectionServiceType);
     377}
     378
    369379- (BOOL)alwaysRunsAtBackgroundPriority
    370380{

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

    r252364 r252368  
    294294    parameters.networkATSContext = adoptCF(_CFNetworkCopyATSContext());
    295295
     296#if PLATFORM(IOS_FAMILY)
     297    parameters.ctDataConnectionServiceType = m_configuration->ctDataConnectionServiceType();
     298#endif
     299
    296300    parameters.shouldSuppressMemoryPressureHandler = [defaults boolForKey:WebKitSuppressMemoryPressureHandlerDefaultsKey];
    297301

  • trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm

    r251976 r252368  
    12981298const String& WebPageProxy::paymentCoordinatorCTDataConnectionServiceType(const WebPaymentCoordinatorProxy&)
    12991299{
     1300    if (!process().processPool().configuration().ctDataConnectionServiceType().isNull())
     1301        return process().processPool().configuration().ctDataConnectionServiceType();
    13001302    return websiteDataStore().configuration().dataConnectionServiceType();
    13011303}
Note: See TracChangeset for help on using the changeset viewer.