Changeset 238886 in webkit

Timestamp:

Dec 4, 2018 9:51:20 PM (5 years ago)

Author:

achristensen@apple.com

Message:

Remove source application identifiers from NetworkProcessCreationParameters
​https://bugs.webkit.org/show_bug.cgi?id=192372

Reviewed by Brady Eidson.

The _WKWebProcessPoolConfiguration way of setting these was deprecated in ​http://trac.webkit.org/r235127
The replacement was adopted in <rdar://problem/46359330>
The transition process is done! Time to remove the old code.

• 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::NetworkSessionCocoa::NetworkSessionCocoa):
(WebKit::globalSourceApplicationAuditTokenData): Deleted.
(WebKit::globalSourceApplicationBundleIdentifier): Deleted.
(WebKit::globalSourceApplicationSecondaryIdentifier): Deleted.
(WebKit::NetworkSessionCocoa::setSourceApplicationAuditTokenData): Deleted.
(WebKit::NetworkSessionCocoa::setSourceApplicationBundleIdentifier): Deleted.
(WebKit::NetworkSessionCocoa::setSourceApplicationSecondaryIdentifier): Deleted.

• UIProcess/API/APIProcessPoolConfiguration.cpp:

(API::ProcessPoolConfiguration::copy):

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

(-[_WKProcessPoolConfiguration sourceApplicationBundleIdentifier]):
(-[_WKProcessPoolConfiguration setSourceApplicationBundleIdentifier:]):
(-[_WKProcessPoolConfiguration sourceApplicationSecondaryIdentifier]):
(-[_WKProcessPoolConfiguration setSourceApplicationSecondaryIdentifier:]):

• UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm:

(WebKit::WebPaymentCoordinatorProxy::platformCanMakePaymentsWithActiveCard):
(WebKit::toPKPaymentRequest):

• UIProcess/Cocoa/WebProcessPoolCocoa.mm:

(WebKit::WebProcessPool::platformInitializeNetworkProcess):

• UIProcess/WebsiteData/WebsiteDataStore.h:

(WebKit::WebsiteDataStore::configuration):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkProcessCreationParameters.cpp (modified) (2 diffs)
• NetworkProcess/NetworkProcessCreationParameters.h (modified) (1 diff)
• NetworkProcess/cocoa/NetworkProcessCocoa.mm (modified) (1 diff)
• NetworkProcess/cocoa/NetworkSessionCocoa.h (modified) (2 diffs)
• NetworkProcess/cocoa/NetworkSessionCocoa.mm (modified) (4 diffs)
• UIProcess/API/APIProcessPoolConfiguration.cpp (modified) (1 diff)
• UIProcess/API/APIProcessPoolConfiguration.h (modified) (2 diffs)
• UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm (modified) (1 diff)
• UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm (modified) (2 diffs)
• UIProcess/Cocoa/WebProcessPoolCocoa.mm (modified) (1 diff)
• UIProcess/WebsiteData/WebsiteDataStore.h (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-12-04  Alex Christensen  <achristensen@webkit.org>
+
+        Remove source application identifiers from NetworkProcessCreationParameters
+        https://bugs.webkit.org/show_bug.cgi?id=192372
+
+        Reviewed by Brady Eidson.
+
+        The _WKWebProcessPoolConfiguration way of setting these was deprecated in http://trac.webkit.org/r235127
+        The replacement was adopted in <rdar://problem/46359330>
+        The transition process is done!  Time to remove the old code.
+
+        * 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::NetworkSessionCocoa::NetworkSessionCocoa):
+        (WebKit::globalSourceApplicationAuditTokenData): Deleted.
+        (WebKit::globalSourceApplicationBundleIdentifier): Deleted.
+        (WebKit::globalSourceApplicationSecondaryIdentifier): Deleted.
+        (WebKit::NetworkSessionCocoa::setSourceApplicationAuditTokenData): Deleted.
+        (WebKit::NetworkSessionCocoa::setSourceApplicationBundleIdentifier): Deleted.
+        (WebKit::NetworkSessionCocoa::setSourceApplicationSecondaryIdentifier): Deleted.
+        * UIProcess/API/APIProcessPoolConfiguration.cpp:
+        (API::ProcessPoolConfiguration::copy):
+        * UIProcess/API/APIProcessPoolConfiguration.h:
+        * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm:
+        (-[_WKProcessPoolConfiguration sourceApplicationBundleIdentifier]):
+        (-[_WKProcessPoolConfiguration setSourceApplicationBundleIdentifier:]):
+        (-[_WKProcessPoolConfiguration sourceApplicationSecondaryIdentifier]):
+        (-[_WKProcessPoolConfiguration setSourceApplicationSecondaryIdentifier:]):
+        * UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm:
+        (WebKit::WebPaymentCoordinatorProxy::platformCanMakePaymentsWithActiveCard):
+        (WebKit::toPKPaymentRequest):
+        * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+        (WebKit::WebProcessPool::platformInitializeNetworkProcess):
+        * UIProcess/WebsiteData/WebsiteDataStore.h:
+        (WebKit::WebsiteDataStore::configuration):
+
 2018-12-04  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp

@@ -69 +69 @@
     encoder << uiProcessBundleIdentifier;
     encoder << uiProcessSDKVersion;
-    encoder << sourceApplicationBundleIdentifier;
-    encoder << sourceApplicationSecondaryIdentifier;
 #if PLATFORM(IOS_FAMILY)
     encoder << ctDataConnectionServiceType;
@@ -180 +178 @@
     if (!decoder.decode(result.uiProcessSDKVersion))
         return false;
-    if (!decoder.decode(result.sourceApplicationBundleIdentifier))
-        return false;
-    if (!decoder.decode(result.sourceApplicationSecondaryIdentifier))
-        return false;
 #if PLATFORM(IOS_FAMILY)
     if (!decoder.decode(result.ctDataConnectionServiceType))

trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h

@@ -83 +83 @@
     String uiProcessBundleIdentifier;
     uint32_t uiProcessSDKVersion { 0 };
-    String sourceApplicationBundleIdentifier;
-    String sourceApplicationSecondaryIdentifier;
 #if PLATFORM(IOS_FAMILY)
     String ctDataConnectionServiceType;

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

@@ -89 +89 @@
     SessionTracker::setIdentifierBase(parameters.uiProcessBundleIdentifier);
 
-    NetworkSessionCocoa::setSourceApplicationAuditTokenData(sourceApplicationAuditData());
-    NetworkSessionCocoa::setSourceApplicationBundleIdentifier(parameters.sourceApplicationBundleIdentifier);
-    NetworkSessionCocoa::setSourceApplicationSecondaryIdentifier(parameters.sourceApplicationSecondaryIdentifier);
 #if PLATFORM(IOS_FAMILY)
     NetworkSessionCocoa::setCTDataConnectionServiceType(parameters.ctDataConnectionServiceType);

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

@@ -49 +49 @@
 
     // Must be called before any NetworkSession has been created.
-    // FIXME: Move these to NetworkSessionCreationParameters.
-    static void setSourceApplicationAuditTokenData(RetainPtr<CFDataRef>&&);
-    static void setSourceApplicationBundleIdentifier(const String&);
-    static void setSourceApplicationSecondaryIdentifier(const String&);
+    // FIXME: Move this to NetworkSessionCreationParameters.
 #if PLATFORM(IOS_FAMILY)
     static void setCTDataConnectionServiceType(const String&);
@@ -87 +84 @@
     bool m_shouldLogCookieInformation { false };
     Seconds m_loadThrottleLatency;
-
-    String m_sourceApplicationBundleIdentifier;
-    String m_sourceApplicationSecondaryIdentifier;
 };
 

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

@@ -584 +584 @@
 }
 
-static RetainPtr<CFDataRef>& globalSourceApplicationAuditTokenData()
-{
-    static NeverDestroyed<RetainPtr<CFDataRef>> sourceApplicationAuditTokenData;
-    return sourceApplicationAuditTokenData.get();
-}
-
-static String& globalSourceApplicationBundleIdentifier()
-{
-    static NeverDestroyed<String> sourceApplicationBundleIdentifier;
-    return sourceApplicationBundleIdentifier.get();
-}
-
-static String& globalSourceApplicationSecondaryIdentifier()
-{
-    static NeverDestroyed<String> sourceApplicationSecondaryIdentifier;
-    return sourceApplicationSecondaryIdentifier.get();
-}
-
 #if PLATFORM(IOS_FAMILY)
 static String& globalCTDataConnectionServiceType()
@@ -609 +591 @@
 }
 #endif
-    
-void NetworkSessionCocoa::setSourceApplicationAuditTokenData(RetainPtr<CFDataRef>&& data)
-{
-    ASSERT(!sessionsCreated);
-    globalSourceApplicationAuditTokenData() = data;
-}
-
-void NetworkSessionCocoa::setSourceApplicationBundleIdentifier(const String& identifier)
-{
-    ASSERT(!sessionsCreated);
-    globalSourceApplicationBundleIdentifier() = identifier;
-}
-
-void NetworkSessionCocoa::setSourceApplicationSecondaryIdentifier(const String& identifier)
-{
-    ASSERT(!sessionsCreated);
-    globalSourceApplicationSecondaryIdentifier() = identifier;
-}
 
 #if PLATFORM(IOS_FAMILY)
@@ -647 +611 @@
     , m_shouldLogCookieInformation(parameters.shouldLogCookieInformation)
     , m_loadThrottleLatency(parameters.loadThrottleLatency)
-    , m_sourceApplicationBundleIdentifier(parameters.sourceApplicationBundleIdentifier)
-    , m_sourceApplicationSecondaryIdentifier(parameters.sourceApplicationSecondaryIdentifier)
 {
     ASSERT(hasProcessPrivilege(ProcessPrivilege::CanAccessRawCookies));
@@ -671 +633 @@
     configuration.URLCache = nil;
 
-    if (auto& data = globalSourceApplicationAuditTokenData())
+    if (auto data = NetworkProcess::singleton().sourceApplicationAuditData())
         configuration._sourceApplicationAuditTokenData = (__bridge NSData *)data.get();
 
-    auto& sourceApplicationBundleIdentifier = globalSourceApplicationBundleIdentifier();
-    if (!m_sourceApplicationBundleIdentifier.isEmpty()) {
-        configuration._sourceApplicationBundleIdentifier = m_sourceApplicationBundleIdentifier;
+    if (!parameters.sourceApplicationBundleIdentifier.isEmpty()) {
+        configuration._sourceApplicationBundleIdentifier = parameters.sourceApplicationBundleIdentifier;
         configuration._sourceApplicationAuditTokenData = nil;
-    } else if (!sourceApplicationBundleIdentifier.isEmpty()) {
-        configuration._sourceApplicationBundleIdentifier = sourceApplicationBundleIdentifier;
-        configuration._sourceApplicationAuditTokenData = nil;
-    }
-
-    auto& sourceApplicationSecondaryIdentifier = globalSourceApplicationSecondaryIdentifier();
-    if (!m_sourceApplicationSecondaryIdentifier.isEmpty())
-        configuration._sourceApplicationSecondaryIdentifier = m_sourceApplicationSecondaryIdentifier;
-    else if (!sourceApplicationSecondaryIdentifier.isEmpty())
-        configuration._sourceApplicationSecondaryIdentifier = sourceApplicationSecondaryIdentifier;
+    }
+
+    if (!parameters.sourceApplicationSecondaryIdentifier.isEmpty())
+        configuration._sourceApplicationSecondaryIdentifier = parameters.sourceApplicationSecondaryIdentifier;
 
 #if PLATFORM(IOS_FAMILY)

trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp

@@ -110 +110 @@
     copy->m_attrStyleEnabled = this->m_attrStyleEnabled;
     copy->m_overrideLanguages = this->m_overrideLanguages;
-    copy->m_sourceApplicationBundleIdentifier = this->m_sourceApplicationBundleIdentifier;
-    copy->m_sourceApplicationSecondaryIdentifier = this->m_sourceApplicationSecondaryIdentifier;
     copy->m_alwaysRunsAtBackgroundPriority = this->m_alwaysRunsAtBackgroundPriority;
     copy->m_shouldTakeUIBackgroundAssertion = this->m_shouldTakeUIBackgroundAssertion;

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

@@ -129 +129 @@
     const Vector<WTF::String>& overrideLanguages() const { return m_overrideLanguages; }
     void setOverrideLanguages(Vector<WTF::String>&& languages) { m_overrideLanguages = WTFMove(languages); }
-
-    const WTF::String& sourceApplicationBundleIdentifier() const { return m_sourceApplicationBundleIdentifier; }
-    void setSourceApplicationBundleIdentifier(const WTF::String& sourceApplicationBundleIdentifier) { m_sourceApplicationBundleIdentifier = sourceApplicationBundleIdentifier; }
-
-    const WTF::String& sourceApplicationSecondaryIdentifier() const { return m_sourceApplicationSecondaryIdentifier; }
-    void setSourceApplicationSecondaryIdentifier(const WTF::String& sourceApplicationSecondaryIdentifier) { m_sourceApplicationSecondaryIdentifier = sourceApplicationSecondaryIdentifier; }
     
     bool alwaysRunsAtBackgroundPriority() const { return m_alwaysRunsAtBackgroundPriority; }
@@ -210 +204 @@
     bool m_attrStyleEnabled { false };
     Vector<WTF::String> m_overrideLanguages;
-    WTF::String m_sourceApplicationBundleIdentifier;
-    WTF::String m_sourceApplicationSecondaryIdentifier;
     bool m_alwaysRunsAtBackgroundPriority { false };
     bool m_shouldTakeUIBackgroundAssertion { true };

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

@@ -202 +202 @@
 - (NSString *)sourceApplicationBundleIdentifier
 {
-    return _processPoolConfiguration->sourceApplicationBundleIdentifier();
+    return nil;
 }
 
 - (void)setSourceApplicationBundleIdentifier:(NSString *)sourceApplicationBundleIdentifier
 {
-    _processPoolConfiguration->setSourceApplicationBundleIdentifier(sourceApplicationBundleIdentifier);
 }
 
 - (NSString *)sourceApplicationSecondaryIdentifier
 {
-    return _processPoolConfiguration->sourceApplicationSecondaryIdentifier();
+    return nil;
 }
 
 - (void)setSourceApplicationSecondaryIdentifier:(NSString *)sourceApplicationSecondaryIdentifier
 {
-    _processPoolConfiguration->setSourceApplicationSecondaryIdentifier(sourceApplicationSecondaryIdentifier);
 }
 

trunk/Source/WebKit/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm

@@ -265 +265 @@
 {
 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
-    PKCanMakePaymentsWithMerchantIdentifierDomainAndSourceApplication(merchantIdentifier, domainName, m_webPageProxy.process().processPool().configuration().sourceApplicationSecondaryIdentifier(), BlockPtr<void(BOOL, NSError *)>::fromCallable([completionHandler = WTFMove(completionHandler)](BOOL canMakePayments, NSError *error) mutable {
+    PKCanMakePaymentsWithMerchantIdentifierDomainAndSourceApplication(merchantIdentifier, domainName, m_webPageProxy.websiteDataStore().configuration().sourceApplicationSecondaryIdentifier, BlockPtr<void(BOOL, NSError *)>::fromCallable([completionHandler = WTFMove(completionHandler)](BOOL canMakePayments, NSError *error) mutable {
         if (error)
             LOG_ERROR("PKCanMakePaymentsWithMerchantIdentifierAndDomain error %@", error);
@@ -507 +507 @@
 
     // FIXME: Instead of using respondsToSelector, this should use a proper #if version check.
-    auto& configuration = webPageProxy.process().processPool().configuration();
-
-    if (!configuration.sourceApplicationBundleIdentifier().isEmpty() && [result respondsToSelector:@selector(setSourceApplicationBundleIdentifier:)])
-        [result setSourceApplicationBundleIdentifier:configuration.sourceApplicationBundleIdentifier()];
-
-    if (!configuration.sourceApplicationSecondaryIdentifier().isEmpty() && [result respondsToSelector:@selector(setSourceApplicationSecondaryIdentifier:)])
-        [result setSourceApplicationSecondaryIdentifier:configuration.sourceApplicationSecondaryIdentifier()];
+    auto& configuration = webPageProxy.websiteDataStore().configuration();
+
+    if (!configuration.sourceApplicationBundleIdentifier.isEmpty() && [result respondsToSelector:@selector(setSourceApplicationBundleIdentifier:)])
+        [result setSourceApplicationBundleIdentifier:configuration.sourceApplicationBundleIdentifier];
+
+    if (!configuration.sourceApplicationSecondaryIdentifier.isEmpty() && [result respondsToSelector:@selector(setSourceApplicationSecondaryIdentifier:)])
+        [result setSourceApplicationSecondaryIdentifier:configuration.sourceApplicationSecondaryIdentifier];
 
 #if PLATFORM(IOS_FAMILY)
-    if (!configuration.ctDataConnectionServiceType().isEmpty() && [result respondsToSelector:@selector(setCTDataConnectionServiceType:)])
-        [result setCTDataConnectionServiceType:configuration.ctDataConnectionServiceType()];
+    if (!webPageProxy.process().processPool().configuration().ctDataConnectionServiceType().isEmpty() && [result respondsToSelector:@selector(setCTDataConnectionServiceType:)])
+        [result setCTDataConnectionServiceType:webPageProxy.process().processPool().configuration().ctDataConnectionServiceType()];
 #endif
 

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

@@ -266 +266 @@
     parameters.shouldEnableNetworkCacheEfficacyLogging = [defaults boolForKey:WebKitNetworkCacheEfficacyLoggingEnabledDefaultsKey];
 
-    parameters.sourceApplicationBundleIdentifier = m_configuration->sourceApplicationBundleIdentifier();
-    parameters.sourceApplicationSecondaryIdentifier = m_configuration->sourceApplicationSecondaryIdentifier();
 #if PLATFORM(IOS_FAMILY)
     parameters.ctDataConnectionServiceType = m_configuration->ctDataConnectionServiceType();

trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h

@@ -210 +210 @@
     void didCreateNetworkProcess();
 
+    const Configuration& configuration() { return m_configuration; }
+
 private:
     explicit WebsiteDataStore(PAL::SessionID);