Diff
Modified: trunk/Source/WebKit/ChangeLog (238885 => 238886)
--- trunk/Source/WebKit/ChangeLog 2018-12-05 03:58:01 UTC (rev 238885)
+++ trunk/Source/WebKit/ChangeLog 2018-12-05 05:51:20 UTC (rev 238886)
@@ -1,3 +1,45 @@
+2018-12-04 Alex Christensen <achristen...@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 <you...@apple.com>
Calling getUserMedia in a link that was opened with target="_blank" does not work the second time
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp (238885 => 238886)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp 2018-12-05 03:58:01 UTC (rev 238885)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp 2018-12-05 05:51:20 UTC (rev 238886)
@@ -68,8 +68,6 @@
#if PLATFORM(COCOA)
encoder << uiProcessBundleIdentifier;
encoder << uiProcessSDKVersion;
- encoder << sourceApplicationBundleIdentifier;
- encoder << sourceApplicationSecondaryIdentifier;
#if PLATFORM(IOS_FAMILY)
encoder << ctDataConnectionServiceType;
#endif
@@ -179,10 +177,6 @@
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;
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h (238885 => 238886)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h 2018-12-05 03:58:01 UTC (rev 238885)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h 2018-12-05 05:51:20 UTC (rev 238886)
@@ -82,8 +82,6 @@
#if PLATFORM(COCOA)
String uiProcessBundleIdentifier;
uint32_t uiProcessSDKVersion { 0 };
- String sourceApplicationBundleIdentifier;
- String sourceApplicationSecondaryIdentifier;
#if PLATFORM(IOS_FAMILY)
String ctDataConnectionServiceType;
#endif
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm (238885 => 238886)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2018-12-05 03:58:01 UTC (rev 238885)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2018-12-05 05:51:20 UTC (rev 238886)
@@ -88,9 +88,6 @@
SessionTracker::setIdentifierBase(parameters.uiProcessBundleIdentifier);
- NetworkSessionCocoa::setSourceApplicationAuditTokenData(sourceApplicationAuditData());
- NetworkSessionCocoa::setSourceApplicationBundleIdentifier(parameters.sourceApplicationBundleIdentifier);
- NetworkSessionCocoa::setSourceApplicationSecondaryIdentifier(parameters.sourceApplicationSecondaryIdentifier);
#if PLATFORM(IOS_FAMILY)
NetworkSessionCocoa::setCTDataConnectionServiceType(parameters.ctDataConnectionServiceType);
#endif
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.h (238885 => 238886)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.h 2018-12-05 03:58:01 UTC (rev 238885)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.h 2018-12-05 05:51:20 UTC (rev 238886)
@@ -48,10 +48,7 @@
~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 @@
RetainPtr<CFDictionaryRef> m_proxyConfiguration;
bool m_shouldLogCookieInformation { false };
Seconds m_loadThrottleLatency;
-
- String m_sourceApplicationBundleIdentifier;
- String m_sourceApplicationSecondaryIdentifier;
};
} // namespace WebKit
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (238885 => 238886)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2018-12-05 03:58:01 UTC (rev 238885)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2018-12-05 05:51:20 UTC (rev 238886)
@@ -583,24 +583,6 @@
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,25 +590,7 @@
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 @@
, 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 @@
// The WebKit network cache was already queried.
configuration.URLCache = nil;
- if (auto& data = ""
+ if (auto data = ""
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)
auto& ctDataConnectionServiceType = globalCTDataConnectionServiceType();
Modified: trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp (238885 => 238886)
--- trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp 2018-12-05 03:58:01 UTC (rev 238885)
+++ trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp 2018-12-05 05:51:20 UTC (rev 238886)
@@ -109,8 +109,6 @@
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;
Modified: trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h (238885 => 238886)
--- trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h 2018-12-05 03:58:01 UTC (rev 238885)
+++ trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h 2018-12-05 05:51:20 UTC (rev 238886)
@@ -128,12 +128,6 @@
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 @@
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 };
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm (238885 => 238886)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm 2018-12-05 03:58:01 UTC (rev 238885)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm 2018-12-05 05:51:20 UTC (rev 238886)
@@ -201,22 +201,20 @@
- (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
Modified: trunk/Source/WebKit/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm (238885 => 238886)
--- trunk/Source/WebKit/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm 2018-12-05 03:58:01 UTC (rev 238885)
+++ trunk/Source/WebKit/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm 2018-12-05 05:51:20 UTC (rev 238886)
@@ -264,7 +264,7 @@
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,17 +506,17 @@
#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:)])
- [result setCTDataConnectionServiceType:configuration.ctDataConnectionServiceType()];
+ if (!webPageProxy.process().processPool().configuration().ctDataConnectionServiceType().isEmpty() && [result respondsToSelector:@selector(setCTDataConnectionServiceType:)])
+ [result setCTDataConnectionServiceType:webPageProxy.process().processPool().configuration().ctDataConnectionServiceType()];
#endif
return result;
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (238885 => 238886)
--- trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2018-12-05 03:58:01 UTC (rev 238885)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2018-12-05 05:51:20 UTC (rev 238886)
@@ -265,8 +265,6 @@
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
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h (238885 => 238886)
--- trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h 2018-12-05 03:58:01 UTC (rev 238885)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h 2018-12-05 05:51:20 UTC (rev 238886)
@@ -209,6 +209,8 @@
void didCreateNetworkProcess();
+ const Configuration& configuration() { return m_configuration; }
+
private:
explicit WebsiteDataStore(PAL::SessionID);
explicit WebsiteDataStore(Configuration, PAL::SessionID);
