Attachment 356524 Details for Bug 192372 – Patch

[patch] Patch

bug-192372-20181204115521.patch (text/plain), 18.81 KB, created by Alex Christensen on 2018-12-04 11:55:22 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2018-12-04 11:55:22 PST

Size: 18.81 KB

patch

obsolete

>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 238868)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,45 @@
>+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 NOBODY (OOPS!).
>+
>+        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  Chris Dumez  <cdumez@apple.com>
> 
>         Regression(r238817) PSON Page Cache API tests are failing
>Index: Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp
>===================================================================
>--- Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp	(revision 238856)
>+++ Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp	(working copy)
>@@ -68,8 +68,6 @@ void NetworkProcessCreationParameters::e
> #if PLATFORM(COCOA)
>     encoder << uiProcessBundleIdentifier;
>     encoder << uiProcessSDKVersion;
>-    encoder << sourceApplicationBundleIdentifier;
>-    encoder << sourceApplicationSecondaryIdentifier;
> #if PLATFORM(IOS_FAMILY)
>     encoder << ctDataConnectionServiceType;
> #endif
>@@ -179,10 +177,6 @@ bool NetworkProcessCreationParameters::d
>         return false;
>     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))
>         return false;
>Index: Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h
>===================================================================
>--- Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h	(revision 238856)
>+++ Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h	(working copy)
>@@ -82,8 +82,6 @@ struct NetworkProcessCreationParameters 
> #if PLATFORM(COCOA)
>     String uiProcessBundleIdentifier;
>     uint32_t uiProcessSDKVersion { 0 };
>-    String sourceApplicationBundleIdentifier;
>-    String sourceApplicationSecondaryIdentifier;
> #if PLATFORM(IOS_FAMILY)
>     String ctDataConnectionServiceType;
> #endif
>Index: Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm
>===================================================================
>--- Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm	(revision 238856)
>+++ Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm	(working copy)
>@@ -88,9 +88,6 @@ void NetworkProcess::platformInitializeN
> 
>     SessionTracker::setIdentifierBase(parameters.uiProcessBundleIdentifier);
> 
>-    NetworkSessionCocoa::setSourceApplicationAuditTokenData(sourceApplicationAuditData());
>-    NetworkSessionCocoa::setSourceApplicationBundleIdentifier(parameters.sourceApplicationBundleIdentifier);
>-    NetworkSessionCocoa::setSourceApplicationSecondaryIdentifier(parameters.sourceApplicationSecondaryIdentifier);
> #if PLATFORM(IOS_FAMILY)
>     NetworkSessionCocoa::setCTDataConnectionServiceType(parameters.ctDataConnectionServiceType);
> #endif
>Index: Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.h
>===================================================================
>--- Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.h	(revision 238856)
>+++ Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.h	(working copy)
>@@ -48,10 +48,7 @@ public:
>     ~NetworkSessionCocoa();
> 
>     // 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&);
> #endif
>@@ -86,9 +83,6 @@ private:
>     RetainPtr<CFDictionaryRef> m_proxyConfiguration;
>     bool m_shouldLogCookieInformation { false };
>     Seconds m_loadThrottleLatency;
>-
>-    String m_sourceApplicationBundleIdentifier;
>-    String m_sourceApplicationSecondaryIdentifier;
> };
> 
> } // namespace WebKit
>Index: Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm
>===================================================================
>--- Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm	(revision 238856)
>+++ Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm	(working copy)
>@@ -583,24 +583,6 @@ static NSURLSessionConfiguration *config
>     return [NSURLSessionConfiguration defaultSessionConfiguration];
> }
> 
>-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()
> {
>@@ -608,24 +590,6 @@ static String& globalCTDataConnectionSer
>     return ctDataConnectionServiceType.get();
> }
> #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)
> void NetworkSessionCocoa::setCTDataConnectionServiceType(const String& type)
>@@ -646,8 +610,6 @@ NetworkSessionCocoa::NetworkSessionCocoa
>     , m_proxyConfiguration(parameters.proxyConfiguration)
>     , m_shouldLogCookieInformation(parameters.shouldLogCookieInformation)
>     , m_loadThrottleLatency(parameters.loadThrottleLatency)
>-    , m_sourceApplicationBundleIdentifier(parameters.sourceApplicationBundleIdentifier)
>-    , m_sourceApplicationSecondaryIdentifier(parameters.sourceApplicationSecondaryIdentifier)
> {
>     ASSERT(hasProcessPrivilege(ProcessPrivilege::CanAccessRawCookies));
> 
>@@ -670,23 +632,16 @@ NetworkSessionCocoa::NetworkSessionCocoa
>     // The WebKit network cache was already queried.
>     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;
>-        configuration._sourceApplicationAuditTokenData = nil;
>-    } else if (!sourceApplicationBundleIdentifier.isEmpty()) {
>-        configuration._sourceApplicationBundleIdentifier = sourceApplicationBundleIdentifier;
>+    if (!parameters.sourceApplicationBundleIdentifier.isEmpty()) {
>+        configuration._sourceApplicationBundleIdentifier = parameters.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)
>     auto& ctDataConnectionServiceType = globalCTDataConnectionServiceType();
>Index: Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp
>===================================================================
>--- Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp	(revision 238856)
>+++ Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp	(working copy)
>@@ -109,8 +109,6 @@ Ref<ProcessPoolConfiguration> ProcessPoo
>     copy->m_ignoreSynchronousMessagingTimeoutsForTesting = this->m_ignoreSynchronousMessagingTimeoutsForTesting;
>     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;
>     copy->m_shouldCaptureAudioInUIProcess = this->m_shouldCaptureAudioInUIProcess;
>Index: Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h
>===================================================================
>--- Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h	(revision 238856)
>+++ Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h	(working copy)
>@@ -128,12 +128,6 @@ public:
> 
>     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; }
>     void setAlwaysRunsAtBackgroundPriority(bool alwaysRunsAtBackgroundPriority) { m_alwaysRunsAtBackgroundPriority = alwaysRunsAtBackgroundPriority; }
>@@ -209,8 +203,6 @@ private:
>     bool m_ignoreSynchronousMessagingTimeoutsForTesting { false };
>     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 };
>     bool m_shouldCaptureAudioInUIProcess { false };
>Index: Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm
>===================================================================
>--- Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm	(revision 238856)
>+++ Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm	(working copy)
>@@ -201,22 +201,20 @@ - (void)setAlwaysRevalidatedURLSchemes:(
> 
> - (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);
> }
> 
> - (BOOL)shouldCaptureAudioInUIProcess
>Index: Source/WebKit/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm
>===================================================================
>--- Source/WebKit/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm	(revision 238856)
>+++ Source/WebKit/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm	(working copy)
>@@ -264,7 +264,7 @@ bool WebPaymentCoordinatorProxy::platfor
> void WebPaymentCoordinatorProxy::platformCanMakePaymentsWithActiveCard(const String& merchantIdentifier, const String& domainName, WTF::Function<void (bool)>&& completionHandler)
> {
> #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);
> 
>@@ -506,13 +506,13 @@ RetainPtr<PKPaymentRequest> toPKPaymentR
> #endif
> 
>     // FIXME: Instead of using respondsToSelector, this should use a proper #if version check.
>-    auto& configuration = webPageProxy.process().processPool().configuration();
>+    auto& configuration = webPageProxy.websiteDataStore().configuration();
> 
>-    if (!configuration.sourceApplicationBundleIdentifier().isEmpty() && [result respondsToSelector:@selector(setSourceApplicationBundleIdentifier:)])
>-        [result setSourceApplicationBundleIdentifier:configuration.sourceApplicationBundleIdentifier()];
>+    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 (!configuration.sourceApplicationSecondaryIdentifier.isEmpty() && [result respondsToSelector:@selector(setSourceApplicationSecondaryIdentifier:)])
>+        [result setSourceApplicationSecondaryIdentifier:configuration.sourceApplicationSecondaryIdentifier];
> 
> #if PLATFORM(IOS_FAMILY)
>     if (!configuration.ctDataConnectionServiceType().isEmpty() && [result respondsToSelector:@selector(setCTDataConnectionServiceType:)])
>Index: Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm
>===================================================================
>--- Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm	(revision 238856)
>+++ Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm	(working copy)
>@@ -265,8 +265,6 @@ void WebProcessPool::platformInitializeN
> 
>     parameters.shouldEnableNetworkCacheEfficacyLogging = [defaults boolForKey:WebKitNetworkCacheEfficacyLoggingEnabledDefaultsKey];
> 
>-    parameters.sourceApplicationBundleIdentifier = m_configuration->sourceApplicationBundleIdentifier();
>-    parameters.sourceApplicationSecondaryIdentifier = m_configuration->sourceApplicationSecondaryIdentifier();
> #if PLATFORM(IOS_FAMILY)
>     parameters.ctDataConnectionServiceType = m_configuration->ctDataConnectionServiceType();
> #endif
>Index: Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h
>===================================================================
>--- Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h	(revision 238856)
>+++ Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h	(working copy)
>@@ -209,6 +209,8 @@ public:
> 
>     void didCreateNetworkProcess();
> 
>+    const Configuration& configuration() { return m_configuration; }
>+
> private:
>     explicit WebsiteDataStore(PAL::SessionID);
>     explicit WebsiteDataStore(Configuration, PAL::SessionID);

Actions: View | Formatted Diff | Diff

Attachments on bug 192372: 356524 | 356535 | 356539 | 356540 | 356547 | 356558