Changeset 235127 in webkit

Timestamp:

Aug 21, 2018 11:12:35 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

Add _WKWebsiteDataStoreConfiguration. sourceApplicationBundleIdentifier and sourceApplicationSecondaryIdentifier
​https://bugs.webkit.org/show_bug.cgi?id=188748

Patch by Alex Christensen <​achristensen@webkit.org> on 2018-08-21
Reviewed by Ryosuke Niwa.

• NetworkProcess/NetworkSessionCreationParameters.h:

(WebKit::NetworkSessionCreationParameters::encode const):
(WebKit::NetworkSessionCreationParameters::decode):

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

(WebKit::NetworkSessionCocoa::NetworkSessionCocoa):

• Shared/WebsiteDataStoreParameters.cpp:

(WebKit::WebsiteDataStoreParameters::privateSessionParameters):

• UIProcess/API/Cocoa/WKWebsiteDataStore.mm:

(-[WKWebsiteDataStore _initWithConfiguration:]):

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

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

• UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm:

(WebKit::WebsiteDataStore::parameters):

• UIProcess/WebsiteData/WebsiteDataStore.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkSessionCreationParameters.h (modified) (4 diffs)
• NetworkProcess/cocoa/NetworkSessionCocoa.h (modified) (1 diff)
• NetworkProcess/cocoa/NetworkSessionCocoa.mm (modified) (2 diffs)
• Shared/WebsiteDataStoreParameters.cpp (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebsiteDataStore.mm (modified) (1 diff)
• UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h (modified) (1 diff)
• UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.h (modified) (1 diff)
• UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.mm (modified) (2 diffs)
• UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm (modified) (2 diffs)
• UIProcess/WebsiteData/WebsiteDataStore.h (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-08-21  Alex Christensen  <achristensen@webkit.org>
+
+        Add _WKWebsiteDataStoreConfiguration. sourceApplicationBundleIdentifier and sourceApplicationSecondaryIdentifier
+        https://bugs.webkit.org/show_bug.cgi?id=188748
+
+        Reviewed by Ryosuke Niwa.
+
+        * NetworkProcess/NetworkSessionCreationParameters.h:
+        (WebKit::NetworkSessionCreationParameters::encode const):
+        (WebKit::NetworkSessionCreationParameters::decode):
+        * NetworkProcess/cocoa/NetworkSessionCocoa.h:
+        * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+        (WebKit::NetworkSessionCocoa::NetworkSessionCocoa):
+        * Shared/WebsiteDataStoreParameters.cpp:
+        (WebKit::WebsiteDataStoreParameters::privateSessionParameters):
+        * UIProcess/API/Cocoa/WKWebsiteDataStore.mm:
+        (-[WKWebsiteDataStore _initWithConfiguration:]):
+        * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h:
+        * UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.h:
+        * UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.mm:
+        (-[_WKWebsiteDataStoreConfiguration setSourceApplicationBundleIdentifier:]):
+        (-[_WKWebsiteDataStoreConfiguration sourceApplicationBundleIdentifier]):
+        (-[_WKWebsiteDataStoreConfiguration sourceApplicationSecondaryIdentifier]):
+        (-[_WKWebsiteDataStoreConfiguration setSourceApplicationSecondaryIdentifier:]):
+        * UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm:
+        (WebKit::WebsiteDataStore::parameters):
+        * UIProcess/WebsiteData/WebsiteDataStore.h:
+
 2018-08-21  Per Arne Vollan  <pvollan@apple.com>
 

trunk/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.h

@@ -50 +50 @@
 #if PLATFORM(COCOA)
     RetainPtr<CFDictionaryRef> proxyConfiguration;
+    String sourceApplicationBundleIdentifier;
+    String sourceApplicationSecondaryIdentifier;
 #endif
 };
@@ -60 +62 @@
 #if PLATFORM(COCOA)
     IPC::encode(encoder, proxyConfiguration.get());
+    encoder << sourceApplicationBundleIdentifier;
+    encoder << sourceApplicationSecondaryIdentifier;
 #endif
 }
@@ -83 +87 @@
     if (!IPC::decode(decoder, proxyConfiguration))
         return std::nullopt;
+    
+    std::optional<String> sourceApplicationBundleIdentifier;
+    decoder >> sourceApplicationBundleIdentifier;
+    if (!sourceApplicationBundleIdentifier)
+        return std::nullopt;
+    
+    std::optional<String> sourceApplicationSecondaryIdentifier;
+    decoder >> sourceApplicationSecondaryIdentifier;
+    if (!sourceApplicationSecondaryIdentifier)
+        return std::nullopt;
 #endif
     
@@ -91 +105 @@
 #if PLATFORM(COCOA)
         , WTFMove(proxyConfiguration)
+        , WTFMove(*sourceApplicationBundleIdentifier)
+        , WTFMove(*sourceApplicationSecondaryIdentifier)
 #endif
     }};

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

@@ -83 +83 @@
     String m_boundInterfaceIdentifier;
     RetainPtr<CFDictionaryRef> m_proxyConfiguration;
+
+    String m_sourceApplicationBundleIdentifier;
+    String m_sourceApplicationSecondaryIdentifier;
 };
 

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

@@ -681 +681 @@
 
     auto& sourceApplicationBundleIdentifier = globalSourceApplicationBundleIdentifier();
-    if (!sourceApplicationBundleIdentifier.isEmpty()) {
+    if (!m_sourceApplicationBundleIdentifier.isEmpty()) {
+        configuration._sourceApplicationBundleIdentifier = m_sourceApplicationBundleIdentifier;
+        configuration._sourceApplicationAuditTokenData = nil;
+    } else if (!sourceApplicationBundleIdentifier.isEmpty()) {
         configuration._sourceApplicationBundleIdentifier = sourceApplicationBundleIdentifier;
         configuration._sourceApplicationAuditTokenData = nil;
@@ -687 +690 @@
 
     auto& sourceApplicationSecondaryIdentifier = globalSourceApplicationSecondaryIdentifier();
-    if (!sourceApplicationSecondaryIdentifier.isEmpty())
+    if (!m_sourceApplicationSecondaryIdentifier.isEmpty())
+        configuration._sourceApplicationSecondaryIdentifier = m_sourceApplicationSecondaryIdentifier;
+    else if (!sourceApplicationSecondaryIdentifier.isEmpty())
         configuration._sourceApplicationSecondaryIdentifier = sourceApplicationSecondaryIdentifier;
 

trunk/Source/WebKit/Shared/WebsiteDataStoreParameters.cpp

@@ -73 +73 @@
     return { { }, { }, { }, { sessionID, { }, AllowsCellularAccess::Yes
 #if PLATFORM(COCOA)
-        , nullptr
+        , nullptr , { } , { }
 #endif
     }};

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

@@ -208 +208 @@
     if (configuration._serviceWorkerRegistrationDirectory)
         config.serviceWorkerRegistrationDirectory = configuration._serviceWorkerRegistrationDirectory.path;
+    if (configuration.sourceApplicationBundleIdentifier)
+        config.sourceApplicationBundleIdentifier = configuration.sourceApplicationBundleIdentifier;
+    if (configuration.sourceApplicationSecondaryIdentifier)
+        config.sourceApplicationSecondaryIdentifier = configuration.sourceApplicationSecondaryIdentifier;
 
     API::Object::constructInWrapper<API::WebsiteDataStore>(self, config, PAL::SessionID::generatePersistentSessionID());

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

@@ -55 +55 @@
 @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, nullable, copy) NSString *sourceApplicationBundleIdentifier WK_API_AVAILABLE(macosx(10.12.3), ios(10.3));
-@property (nonatomic, nullable, copy) NSString *sourceApplicationSecondaryIdentifier WK_API_AVAILABLE(macosx(10.12.3), ios(10.3));
+@property (nonatomic, nullable, copy) NSString *sourceApplicationBundleIdentifier WK_API_DEPRECATED_WITH_REPLACEMENT("_WKWebsiteDataStoreConfiguration.sourceApplicationBundleIdentifier", macosx(10.12.3, WK_MAC_TBA), ios(10.3, WK_IOS_TBA));
+@property (nonatomic, nullable, copy) NSString *sourceApplicationSecondaryIdentifier WK_API_DEPRECATED_WITH_REPLACEMENT("_WKWebsiteDataStoreConfiguration.sourceApplicationSecondaryIdentifier", macosx(10.12.3, WK_MAC_TBA), ios(10.3, WK_IOS_TBA));
 @property (nonatomic) BOOL shouldCaptureAudioInUIProcess WK_API_AVAILABLE(macosx(10.13), ios(11.0));
 #if TARGET_OS_IPHONE

trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.h

@@ -42 +42 @@
 @property (nonatomic, copy, setter=_setCacheStorageDirectory:) NSURL *_cacheStorageDirectory WK_API_AVAILABLE(macosx(10.13.4), ios(11.3));
 @property (nonatomic, copy, setter=_setServiceWorkerRegistrationDirectory:) NSURL *_serviceWorkerRegistrationDirectory WK_API_AVAILABLE(macosx(10.13.4), ios(11.3));
+@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));
 
 @end

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

@@ -45 +45 @@
     RetainPtr<NSURL> _cacheStorageDirectoryURL;
     RetainPtr<NSURL> _serviceWorkerRegistrationDirectoryURL;
+    RetainPtr<NSString> _sourceApplicationBundleIdentifier;
+    RetainPtr<NSString> _sourceApplicationSecondaryIdentifier;
 }
 
@@ -127 +129 @@
 }
 
+- (void)setSourceApplicationBundleIdentifier:(NSString *)identifier
+{
+    _sourceApplicationBundleIdentifier = identifier;
+}
+
+- (NSString *)sourceApplicationBundleIdentifier
+{
+    return _sourceApplicationBundleIdentifier.get();
+}
+
+- (NSString *)sourceApplicationSecondaryIdentifier
+{
+    return _sourceApplicationSecondaryIdentifier.get();
+}
+
+- (void)setSourceApplicationSecondaryIdentifier:(NSString *)identifier
+{
+    _sourceApplicationSecondaryIdentifier = identifier;
+}
+
 @end
 

trunk/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm

@@ -59 +59 @@
 
     WebsiteDataStoreParameters parameters;
-    parameters.networkSessionParameters = { m_sessionID, m_boundInterfaceIdentifier, m_allowsCellularAccess, m_proxyConfiguration };
+    parameters.networkSessionParameters = {
+        m_sessionID,
+        m_boundInterfaceIdentifier,
+        m_allowsCellularAccess,
+        m_proxyConfiguration,
+        m_configuration.sourceApplicationBundleIdentifier,
+        m_configuration.sourceApplicationSecondaryIdentifier,
+    };
 
     auto cookieFile = resolvedCookieStorageFile();
 
-#if PLATFORM(COCOA)
     if (m_uiProcessCookieStorageIdentifier.isEmpty()) {
         auto utf8File = cookieFile.utf8();
@@ -72 +78 @@
 
     parameters.uiProcessCookieStorageIdentifier = m_uiProcessCookieStorageIdentifier;
-#endif
+    parameters.networkSessionParameters.sourceApplicationBundleIdentifier = m_configuration.sourceApplicationBundleIdentifier;
+    parameters.networkSessionParameters.sourceApplicationSecondaryIdentifier = m_configuration.sourceApplicationSecondaryIdentifier;
 
     parameters.pendingCookies = copyToVector(m_pendingCookies);

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

@@ -94 +94 @@
         String javaScriptConfigurationDirectory;
         String cookieStorageFile;
+        String sourceApplicationBundleIdentifier;
+        String sourceApplicationSecondaryIdentifier;
 
         explicit Configuration();