Diff
Modified: trunk/Source/WebCore/ChangeLog (206603 => 206604)
--- trunk/Source/WebCore/ChangeLog 2016-09-29 19:36:39 UTC (rev 206603)
+++ trunk/Source/WebCore/ChangeLog 2016-09-29 19:48:25 UTC (rev 206604)
@@ -1,3 +1,14 @@
+2016-09-29 Sam Weinig <[email protected]>
+
+ Allow overriding some NSURLSessionConfiguration properties on a per-NetworkProcess basis
+ <rdar://problem/27648683>
+ https://bugs.webkit.org/show_bug.cgi?id=162735
+
+ Reviewed by Dan Bernstein.
+
+ * platform/spi/cf/CFNetworkSPI.h:
+ Forward declare _sourceApplicationSecondaryIdentifier and _CTDataConnectionServiceType
+
2016-09-29 Antti Koivisto <[email protected]>
Remove addSubresourceStyleURLs functions
Modified: trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h (206603 => 206604)
--- trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h 2016-09-29 19:36:39 UTC (rev 206603)
+++ trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h 2016-09-29 19:48:25 UTC (rev 206604)
@@ -100,7 +100,11 @@
@interface NSURLSessionConfiguration ()
@property (assign) _TimingDataOptions _timingDataOptions;
@property (copy) NSData *_sourceApplicationAuditTokenData;
-@property (copy) NSString *_sourceApplicationBundleIdentifier;
+@property (nullable, copy) NSString *_sourceApplicationBundleIdentifier;
+@property (nullable, copy) NSString *_sourceApplicationSecondaryIdentifier;
+#if PLATFORM(IOS)
+@property (nullable, copy) NSString *_CTDataConnectionServiceType;
+#endif
@end
#endif
Modified: trunk/Source/WebKit2/ChangeLog (206603 => 206604)
--- trunk/Source/WebKit2/ChangeLog 2016-09-29 19:36:39 UTC (rev 206603)
+++ trunk/Source/WebKit2/ChangeLog 2016-09-29 19:48:25 UTC (rev 206604)
@@ -1,3 +1,53 @@
+2016-09-29 Sam Weinig <[email protected]>
+
+ Allow overriding some NSURLSessionConfiguration properties on a per-NetworkProcess basis
+ <rdar://problem/27648683>
+ https://bugs.webkit.org/show_bug.cgi?id=162735
+
+ Reviewed by Dan Bernstein.
+
+ Add SPI for overriding the following NSURLSessionConfigurations properties:
+ - _sourceApplicationBundleIdentifier
+ - _sourceApplicationSecondaryIdentifier
+ - _CTDataConnectionServiceType
+
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::initializeNetworkProcess):
+ * NetworkProcess/NetworkProcessCreationParameters.cpp:
+ (WebKit::NetworkProcessCreationParameters::encode):
+ (WebKit::NetworkProcessCreationParameters::decode):
+ * NetworkProcess/NetworkProcessCreationParameters.h:
+ * NetworkProcess/NetworkSession.h:
+ * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+ (WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (WebKit::globalSourceApplicationBundleIdentifier):
+ (WebKit::globalSourceApplicationSecondaryIdentifier):
+ (WebKit::globalCTDataConnectionServiceType):
+ (WebKit::NetworkSession::setCustomProtocolManager):
+ (WebKit::NetworkSession::setSourceApplicationAuditTokenData):
+ (WebKit::NetworkSession::setSourceApplicationBundleIdentifier):
+ (WebKit::NetworkSession::setSourceApplicationSecondaryIdentifier):
+ (WebKit::NetworkSession::setCTDataConnectionServiceType):
+ (WebKit::NetworkSession::NetworkSession):
+ * UIProcess/API/APIProcessPoolConfiguration.cpp:
+ (API::ProcessPoolConfiguration::copy):
+ * UIProcess/API/APIProcessPoolConfiguration.h:
+ * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h:
+ * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm:
+ (-[_WKProcessPoolConfiguration sourceApplicationBundleIdentifier]):
+ (-[_WKProcessPoolConfiguration setSourceApplicationBundleIdentifier:]):
+ (-[_WKProcessPoolConfiguration sourceApplicationSecondaryIdentifier]):
+ (-[_WKProcessPoolConfiguration setSourceApplicationSecondaryIdentifier:]):
+ (-[_WKProcessPoolConfiguration CTDataConnectionServiceType]):
+ (-[_WKProcessPoolConfiguration setCTDataConnectionServiceType:]):
+ * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+ (WebKit::WebProcessPool::platformInitializeNetworkProcess):
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::initializeWebProcess):
+ * WebProcess/cocoa/WebProcessCocoa.mm:
+ (WebKit::WebProcess::platformInitializeWebProcess):
+
2016-09-29 Carlos Garcia Campos <[email protected]>
NetworkSession: HTTP authentication doesn't work if PROTECTION_SPACE_AUTH_CALLBACK is not enabled
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (206603 => 206604)
--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2016-09-29 19:36:39 UTC (rev 206603)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2016-09-29 19:48:25 UTC (rev 206604)
@@ -223,14 +223,6 @@
setCanHandleHTTPSServerTrustEvaluation(parameters.canHandleHTTPSServerTrustEvaluation);
-#if PLATFORM(COCOA) || USE(CFNETWORK)
- SessionTracker::setIdentifierBase(parameters.uiProcessBundleIdentifier);
-#endif
-
-#if USE(NETWORK_SESSION)
- NetworkSession::setSourceApplicationAuditTokenData(sourceApplicationAuditData());
-#endif
-
// FIXME: instead of handling this here, a message should be sent later (scales to multiple sessions)
if (parameters.privateBrowsingEnabled)
RemoteNetworkingContext::ensurePrivateBrowsingSession(SessionID::legacyPrivateSessionID());
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.cpp (206603 => 206604)
--- trunk/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.cpp 2016-09-29 19:36:39 UTC (rev 206603)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.cpp 2016-09-29 19:48:25 UTC (rev 206604)
@@ -70,6 +70,11 @@
encoder << uiProcessBundleIdentifier;
encoder << nsURLCacheMemoryCapacity;
encoder << nsURLCacheDiskCapacity;
+ encoder << sourceApplicationBundleIdentifier;
+ encoder << sourceApplicationSecondaryIdentifier;
+#if PLATFORM(IOS)
+ encoder << ctDataConnectionServiceType;
+#endif
encoder << httpProxy;
encoder << httpsProxy;
#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
@@ -142,6 +147,14 @@
return false;
if (!decoder.decode(result.nsURLCacheDiskCapacity))
return false;
+ if (!decoder.decode(result.sourceApplicationBundleIdentifier))
+ return false;
+ if (!decoder.decode(result.sourceApplicationSecondaryIdentifier))
+ return false;
+#if PLATFORM(IOS)
+ if (!decoder.decode(result.ctDataConnectionServiceType))
+ return false;
+#endif
if (!decoder.decode(result.httpProxy))
return false;
if (!decoder.decode(result.httpsProxy))
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.h (206603 => 206604)
--- trunk/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.h 2016-09-29 19:36:39 UTC (rev 206603)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.h 2016-09-29 19:48:25 UTC (rev 206604)
@@ -81,7 +81,11 @@
String uiProcessBundleIdentifier;
uint64_t nsURLCacheMemoryCapacity;
uint64_t nsURLCacheDiskCapacity;
-
+ String sourceApplicationBundleIdentifier;
+ String sourceApplicationSecondaryIdentifier;
+#if PLATFORM(IOS)
+ String ctDataConnectionServiceType;
+#endif
String httpProxy;
String httpsProxy;
#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkSession.h (206603 => 206604)
--- trunk/Source/WebKit2/NetworkProcess/NetworkSession.h 2016-09-29 19:36:39 UTC (rev 206603)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkSession.h 2016-09-29 19:48:25 UTC (rev 206604)
@@ -62,10 +62,16 @@
WebCore::SessionID sessionID() const { return m_sessionID; }
+ // Must be called before any NetworkSession has been created.
static void setCustomProtocolManager(CustomProtocolManager*);
#if PLATFORM(COCOA)
static void setSourceApplicationAuditTokenData(RetainPtr<CFDataRef>&&);
+ static void setSourceApplicationBundleIdentifier(const String&);
+ static void setSourceApplicationSecondaryIdentifier(const String&);
+#if PLATFORM(IOS)
+ static void setCTDataConnectionServiceType(const String&);
#endif
+#endif
void clearCredentials();
Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm (206603 => 206604)
--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2016-09-29 19:36:39 UTC (rev 206603)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2016-09-29 19:48:25 UTC (rev 206604)
@@ -29,7 +29,9 @@
#import "NetworkCache.h"
#import "NetworkProcessCreationParameters.h"
#import "NetworkResourceLoader.h"
+#import "NetworkSession.h"
#import "SandboxExtension.h"
+#import "SessionTracker.h"
#import <WebCore/CFNetworkSPI.h>
#import <WebCore/NetworkStorageSession.h>
#import <WebCore/PublicSuffix.h>
@@ -80,6 +82,17 @@
_CFNetworkSetATSContext(parameters.networkATSContext.get());
#endif
+ SessionTracker::setIdentifierBase(parameters.uiProcessBundleIdentifier);
+
+#if USE(NETWORK_SESSION)
+ NetworkSession::setSourceApplicationAuditTokenData(sourceApplicationAuditData());
+ NetworkSession::setSourceApplicationBundleIdentifier(parameters.sourceApplicationBundleIdentifier);
+ NetworkSession::setSourceApplicationSecondaryIdentifier(parameters.sourceApplicationSecondaryIdentifier);
+#if PLATFORM(IOS)
+ NetworkSession::setCTDataConnectionServiceType(parameters.ctDataConnectionServiceType);
+#endif
+#endif
+
initializeNetworkSettings();
#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm (206603 => 206604)
--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2016-09-29 19:36:39 UTC (rev 206603)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2016-09-29 19:48:25 UTC (rev 206604)
@@ -335,16 +335,62 @@
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)
+static String& globalCTDataConnectionServiceType()
+{
+ static NeverDestroyed<String> ctDataConnectionServiceType;
+ return ctDataConnectionServiceType.get();
+}
+#endif
+
+#if !ASSERT_DISABLED
+static bool sessionsCreated = false;
+#endif
+
void NetworkSession::setCustomProtocolManager(CustomProtocolManager* customProtocolManager)
{
+ ASSERT(!sessionsCreated);
globalCustomProtocolManager() = customProtocolManager;
}
void NetworkSession::setSourceApplicationAuditTokenData(RetainPtr<CFDataRef>&& data)
{
+ ASSERT(!sessionsCreated);
globalSourceApplicationAuditTokenData() = data;
}
+void NetworkSession::setSourceApplicationBundleIdentifier(const String& identifier)
+{
+ ASSERT(!sessionsCreated);
+ globalSourceApplicationBundleIdentifier() = identifier;
+}
+
+void NetworkSession::setSourceApplicationSecondaryIdentifier(const String& identifier)
+{
+ ASSERT(!sessionsCreated);
+ globalSourceApplicationSecondaryIdentifier() = identifier;
+}
+
+#if PLATFORM(IOS)
+void NetworkSession::setCTDataConnectionServiceType(const String& type)
+{
+ ASSERT(!sessionsCreated);
+ globalCTDataConnectionServiceType() = type;
+}
+#endif
+
Ref<NetworkSession> NetworkSession::create(Type type, WebCore::SessionID sessionID, CustomProtocolManager* customProtocolManager)
{
return adoptRef(*new NetworkSession(type, sessionID, customProtocolManager));
@@ -362,6 +408,10 @@
{
relaxAdoptionRequirement();
+#if !ASSERT_DISABLED
+ sessionsCreated = true;
+#endif
+
NSURLSessionConfiguration *configuration = configurationForType(type);
if (NetworkCache::singleton().isEnabled())
@@ -369,7 +419,21 @@
if (auto& data = ""
configuration._sourceApplicationAuditTokenData = (NSData *)data.get();
-
+
+ auto& sourceApplicationBundleIdentifier = globalSourceApplicationBundleIdentifier();
+ if (!sourceApplicationBundleIdentifier.isEmpty())
+ configuration._sourceApplicationBundleIdentifier = sourceApplicationBundleIdentifier;
+
+ auto& sourceApplicationSecondaryIdentifier = globalSourceApplicationSecondaryIdentifier();
+ if (!sourceApplicationSecondaryIdentifier.isEmpty())
+ configuration._sourceApplicationSecondaryIdentifier = sourceApplicationSecondaryIdentifier;
+
+#if PLATFORM(IOS)
+ auto& ctDataConnectionServiceType = globalCTDataConnectionServiceType();
+ if (!ctDataConnectionServiceType.isEmpty())
+ configuration._CTDataConnectionServiceType = ctDataConnectionServiceType;
+#endif
+
if (customProtocolManager)
customProtocolManager->registerProtocolClass(configuration);
Modified: trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp (206603 => 206604)
--- trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp 2016-09-29 19:36:39 UTC (rev 206603)
+++ trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp 2016-09-29 19:48:25 UTC (rev 206604)
@@ -111,6 +111,11 @@
copy->m_fullySynchronousModeIsAllowedForTesting = this->m_fullySynchronousModeIsAllowedForTesting;
copy->m_ignoreSynchronousMessagingTimeoutsForTesting = this->m_ignoreSynchronousMessagingTimeoutsForTesting;
copy->m_overrideLanguages = this->m_overrideLanguages;
+ copy->m_sourceApplicationBundleIdentifier = this->m_sourceApplicationBundleIdentifier;
+ copy->m_sourceApplicationSecondaryIdentifier = this->m_sourceApplicationSecondaryIdentifier;
+#if PLATFORM(IOS)
+ copy->m_ctDataConnectionServiceType = this->m_ctDataConnectionServiceType;
+#endif
return copy;
}
Modified: trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h (206603 => 206604)
--- trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h 2016-09-29 19:36:39 UTC (rev 206603)
+++ trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h 2016-09-29 19:48:25 UTC (rev 206604)
@@ -102,6 +102,17 @@
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; }
+
+#if PLATFORM(IOS)
+ const WTF::String& ctDataConnectionServiceType() const { return m_ctDataConnectionServiceType; }
+ void setCTDataConnectionServiceType(const WTF::String& ctDataConnectionServiceType) { m_ctDataConnectionServiceType = ctDataConnectionServiceType; }
+#endif
+
private:
bool m_shouldHaveLegacyDataStore { false };
@@ -125,6 +136,11 @@
bool m_fullySynchronousModeIsAllowedForTesting { false };
bool m_ignoreSynchronousMessagingTimeoutsForTesting { false };
Vector<WTF::String> m_overrideLanguages;
+ WTF::String m_sourceApplicationBundleIdentifier;
+ WTF::String m_sourceApplicationSecondaryIdentifier;
+#if PLATFORM(IOS)
+ WTF::String m_ctDataConnectionServiceType;
+#endif
};
} // namespace API
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h (206603 => 206604)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h 2016-09-29 19:36:39 UTC (rev 206603)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h 2016-09-29 19:48:25 UTC (rev 206604)
@@ -28,17 +28,31 @@
#if WK_API_ENABLED
+NS_ASSUME_NONNULL_BEGIN
+
WK_CLASS_AVAILABLE(macosx(10.10), ios(8.0))
@interface _WKProcessPoolConfiguration : NSObject <NSCopying>
@property (nonatomic, copy) NSURL *injectedBundleURL;
@property (nonatomic) NSUInteger maximumProcessCount;
+
+@property (nonatomic) BOOL ignoreSynchronousMessagingTimeoutsForTesting WK_API_AVAILABLE(macosx(10.12), ios(10.0));
+
+// Network Process properties
+// FIXME: These should be be per-session/data store when we support multiple non-persistent sessions/data stores.
+
@property (nonatomic) NSInteger diskCacheSizeOverride WK_API_AVAILABLE(macosx(10.11), ios(9.0));
@property (nonatomic, copy) NSArray *cachePartitionedURLSchemes;
@property (nonatomic, copy) NSArray<NSString *> *alwaysRevalidatedURLSchemes WK_API_AVAILABLE(macosx(10.12), ios(10.0));
@property (nonatomic) BOOL diskCacheSpeculativeValidationEnabled WK_API_AVAILABLE(macosx(10.12), ios(10.0));
-@property (nonatomic) BOOL ignoreSynchronousMessagingTimeoutsForTesting WK_API_AVAILABLE(macosx(10.12), ios(10.0));
+@property (nonatomic, nullable, copy) NSString *sourceApplicationBundleIdentifier WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
+@property (nonatomic, nullable, copy) NSString *sourceApplicationSecondaryIdentifier WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
+#if TARGET_OS_IPHONE
+@property (nonatomic, nullable, copy) NSString *CTDataConnectionServiceType WK_API_AVAILABLE(ios(WK_IOS_TBA));
+#endif
@end
+NS_ASSUME_NONNULL_END
+
#endif
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm (206603 => 206604)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm 2016-09-29 19:36:39 UTC (rev 206603)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm 2016-09-29 19:48:25 UTC (rev 206604)
@@ -151,6 +151,38 @@
_processPoolConfiguration->setAlwaysRevalidatedURLSchemes(WTFMove(schemes));
}
+- (NSString *)sourceApplicationBundleIdentifier
+{
+ return _processPoolConfiguration->sourceApplicationBundleIdentifier();
+}
+
+- (void)setSourceApplicationBundleIdentifier:(NSString *)sourceApplicationBundleIdentifier
+{
+ _processPoolConfiguration->setSourceApplicationBundleIdentifier(sourceApplicationBundleIdentifier);
+}
+
+- (NSString *)sourceApplicationSecondaryIdentifier
+{
+ return _processPoolConfiguration->sourceApplicationSecondaryIdentifier();
+}
+
+- (void)setSourceApplicationSecondaryIdentifier:(NSString *)sourceApplicationSecondaryIdentifier
+{
+ _processPoolConfiguration->setSourceApplicationSecondaryIdentifier(sourceApplicationSecondaryIdentifier);
+}
+
+#if PLATFORM(IOS)
+- (NSString *)CTDataConnectionServiceType
+{
+ return _processPoolConfiguration->ctDataConnectionServiceType();
+}
+
+- (void)setCTDataConnectionServiceType:(NSString *)ctDataConnectionServiceType
+{
+ _processPoolConfiguration->setCTDataConnectionServiceType(ctDataConnectionServiceType);
+}
+#endif
+
- (NSString *)description
{
NSString *description = [NSString stringWithFormat:@"<%@: %p; maximumProcessCount = %lu", NSStringFromClass(self.class), self, static_cast<unsigned long>([self maximumProcessCount])];
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm (206603 => 206604)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2016-09-29 19:36:39 UTC (rev 206603)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2016-09-29 19:48:25 UTC (rev 206604)
@@ -241,6 +241,12 @@
parameters.shouldEnableNetworkCacheEfficacyLogging = [defaults boolForKey:WebKitNetworkCacheEfficacyLoggingEnabledDefaultsKey];
#endif
+ parameters.sourceApplicationBundleIdentifier = m_configuration->sourceApplicationBundleIdentifier();
+ parameters.sourceApplicationSecondaryIdentifier = m_configuration->sourceApplicationSecondaryIdentifier();
+#if PLATFORM(IOS)
+ parameters.ctDataConnectionServiceType = m_configuration->ctDataConnectionServiceType();
+#endif
+
parameters.shouldSuppressMemoryPressureHandler = [defaults boolForKey:WebKitSuppressMemoryPressureHandlerDefaultsKey];
#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (206603 => 206604)
--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2016-09-29 19:36:39 UTC (rev 206603)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2016-09-29 19:48:25 UTC (rev 206604)
@@ -359,10 +359,6 @@
if (parameters.shouldUseFontSmoothing)
setShouldUseFontSmoothing(true);
-#if PLATFORM(COCOA) || USE(CFNETWORK)
- SessionTracker::setIdentifierBase(parameters.uiProcessBundleIdentifier);
-#endif
-
if (parameters.shouldUseTestingNetworkSession)
NetworkStorageSession::switchToNewTestingSession();
@@ -391,10 +387,6 @@
}
#endif
-#if USE(NETWORK_SESSION)
- NetworkSession::setSourceApplicationAuditTokenData(sourceApplicationAuditData());
-#endif
-
#if ENABLE(NETSCAPE_PLUGIN_API) && PLATFORM(MAC)
for (auto hostIter = parameters.pluginLoadClientPolicies.begin(); hostIter != parameters.pluginLoadClientPolicies.end(); ++hostIter) {
for (auto bundleIdentifierIter = hostIter->value.begin(); bundleIdentifierIter != hostIter->value.end(); ++bundleIdentifierIter) {
Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (206603 => 206604)
--- trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2016-09-29 19:36:39 UTC (rev 206603)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2016-09-29 19:48:25 UTC (rev 206604)
@@ -31,6 +31,7 @@
#import "SandboxExtension.h"
#import "SandboxInitializationParameters.h"
#import "SecItemShim.h"
+#import "SessionTracker.h"
#import "WKAPICast.h"
#import "WKBrowsingContextHandleInternal.h"
#import "WKFullKeyboardAccessWatcher.h"
@@ -51,9 +52,9 @@
#import <WebCore/MemoryPressureHandler.h>
#import <WebCore/NSAccessibilitySPI.h>
#import <WebCore/RuntimeApplicationChecks.h>
-#import <WebCore/pthreadSPI.h>
#import <WebCore/VNodeTracker.h>
#import <WebCore/WebCoreNSURLExtras.h>
+#import <WebCore/pthreadSPI.h>
#import <WebKitSystemInterface.h>
#import <algorithm>
#import <dispatch/dispatch.h>
@@ -90,6 +91,7 @@
void WebProcess::platformInitializeWebProcess(WebProcessCreationParameters&& parameters)
{
WebCore::setApplicationBundleIdentifier(parameters.uiProcessBundleIdentifier);
+ SessionTracker::setIdentifierBase(parameters.uiProcessBundleIdentifier);
#if ENABLE(SANDBOX_EXTENSIONS)
SandboxExtension::consumePermanently(parameters.uiProcessBundleResourcePathExtensionHandle);
