Changeset 239592 in webkit
- Timestamp:
- Jan 3, 2019 8:51:44 AM (5 years ago)
- Location:
- trunk/Source/WebKit
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/ChangeLog
r239590 r239592 1 2019-01-03 Alex Christensen <achristensen@webkit.org> 2 3 NetworkProcess should initialize its default NetworkSession with parameters from the UIProcess 4 https://bugs.webkit.org/show_bug.cgi?id=192967 5 6 Reviewed by Brent Fulgham. 7 8 I moved 3 of the NetworkProcessCreationParameters to use corresponding values of a WebsiteDataStoreParameters. 9 More will be moved in the near future, like indexedDatabaseDirectory. 10 11 * NetworkProcess/NetworkProcess.cpp: 12 (WebKit::NetworkProcess::initializeNetworkProcess): 13 * NetworkProcess/NetworkProcessCreationParameters.cpp: 14 (WebKit::NetworkProcessCreationParameters::encode const): 15 (WebKit::NetworkProcessCreationParameters::decode): 16 * NetworkProcess/NetworkProcessCreationParameters.h: 17 * UIProcess/Cocoa/WebProcessPoolCocoa.mm: 18 (WebKit::WebProcessPool::platformInitializeNetworkProcess): 19 * UIProcess/WebProcessPool.cpp: 20 (WebKit::WebProcessPool::ensureNetworkProcess): 21 1 22 2019-01-03 Wenson Hsieh <wenson_hsieh@apple.com> 2 23 -
trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp
r239486 r239592 299 299 NetworkStorageSession::switchToNewTestingSession(); 300 300 301 NetworkSessionCreationParameters sessionCreationParameters { }; 302 #if PLATFORM(COCOA) 303 sessionCreationParameters.httpProxy = URL(URL(), parameters.httpProxy); 304 sessionCreationParameters.httpsProxy = URL(URL(), parameters.httpsProxy); 305 #endif 306 SessionTracker::setSession(PAL::SessionID::defaultSessionID(), NetworkSession::create(WTFMove(sessionCreationParameters))); 301 auto sessionID = parameters.defaultDataStoreParameters.networkSessionParameters.sessionID; 302 SessionTracker::setSession(sessionID, NetworkSession::create(WTFMove(parameters.defaultDataStoreParameters.networkSessionParameters))); 307 303 308 304 #if ENABLE(INDEXED_DATABASE) … … 322 318 323 319 auto* defaultSession = SessionTracker::networkSession(PAL::SessionID::defaultSessionID()); 324 for (const auto& cookie : parameters.default SessionPendingCookies)320 for (const auto& cookie : parameters.defaultDataStoreParameters.pendingCookies) 325 321 defaultSession->networkStorageSession().setCookie(cookie); 326 322 -
trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp
r239486 r239592 53 53 encoder << uiProcessCookieStorageIdentifier; 54 54 #endif 55 encoder << defaultSessionPendingCookies;56 55 #if PLATFORM(IOS_FAMILY) 57 56 encoder << cookieStorageDirectoryExtensionHandle; … … 71 70 encoder << ctDataConnectionServiceType; 72 71 #endif 73 encoder << httpProxy;74 encoder << httpsProxy;75 72 IPC::encode(encoder, networkATSContext.get()); 76 73 encoder << storageAccessAPIEnabled; 77 74 encoder << suppressesConnectionTerminationOnSystemChange; 78 75 #endif 76 encoder << defaultDataStoreParameters; 79 77 #if USE(SOUP) 80 78 encoder << cookiePersistentStoragePath; … … 135 133 return false; 136 134 #endif 137 if (!decoder.decode(result.defaultSessionPendingCookies))138 return false;139 135 #if PLATFORM(IOS_FAMILY) 140 136 Optional<SandboxExtension::Handle> cookieStorageDirectoryExtensionHandle; … … 179 175 return false; 180 176 #endif 181 if (!decoder.decode(result.httpProxy))182 return false;183 if (!decoder.decode(result.httpsProxy))184 return false;185 177 if (!IPC::decode(decoder, result.networkATSContext)) 186 178 return false; … … 190 182 return false; 191 183 #endif 184 185 Optional<WebsiteDataStoreParameters> defaultDataStoreParameters; 186 decoder >> defaultDataStoreParameters; 187 if (!defaultDataStoreParameters) 188 return false; 189 result.defaultDataStoreParameters = WTFMove(*defaultDataStoreParameters); 192 190 193 191 #if USE(SOUP) -
trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h
r239486 r239592 28 28 #include "CacheModel.h" 29 29 #include "SandboxExtension.h" 30 #include "WebsiteDataStoreParameters.h" 30 31 #include <WebCore/Cookie.h> 31 32 #include <wtf/ProcessID.h> … … 63 64 Vector<uint8_t> uiProcessCookieStorageIdentifier; 64 65 #endif 65 Vector<WebCore::Cookie> defaultSessionPendingCookies;66 66 #if PLATFORM(IOS_FAMILY) 67 67 SandboxExtension::Handle cookieStorageDirectoryExtensionHandle; … … 83 83 String ctDataConnectionServiceType; 84 84 #endif 85 String httpProxy;86 String httpsProxy;87 85 RetainPtr<CFDataRef> networkATSContext; 88 86 bool storageAccessAPIEnabled; … … 90 88 #endif 91 89 90 WebsiteDataStoreParameters defaultDataStoreParameters; 91 92 92 #if USE(SOUP) 93 93 String cookiePersistentStoragePath; -
trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm
r239322 r239592 265 265 #endif 266 266 if (isSafari) { 267 parameters. httpProxy = [defaults stringForKey:(NSString *)WebKit2HTTPProxyDefaultsKey];268 parameters. httpsProxy = [defaults stringForKey:(NSString *)WebKit2HTTPSProxyDefaultsKey];267 parameters.defaultDataStoreParameters.networkSessionParameters.httpProxy = URL(URL(), [defaults stringForKey:(NSString *)WebKit2HTTPProxyDefaultsKey]); 268 parameters.defaultDataStoreParameters.networkSessionParameters.httpsProxy = URL(URL(), [defaults stringForKey:(NSString *)WebKit2HTTPSProxyDefaultsKey]); 269 269 } 270 270 } -
trunk/Source/WebKit/UIProcess/WebProcessPool.cpp
r239535 r239592 477 477 478 478 if (m_websiteDataStore) { 479 parameters.default SessionPendingCookies = copyToVector(m_websiteDataStore->websiteDataStore().pendingCookies());479 parameters.defaultDataStoreParameters.pendingCookies = copyToVector(m_websiteDataStore->websiteDataStore().pendingCookies()); 480 480 m_websiteDataStore->websiteDataStore().clearPendingCookies(); 481 481 }
Note: See TracChangeset
for help on using the changeset viewer.