WebKit Bugzilla
Attachment 357961 Details for
Bug 192967
: NetworkProcess should initialize its default NetworkSession with parameters from the UIProcess
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-192967-20181221114029.patch (text/plain), 8.36 KB, created by
Alex Christensen
on 2018-12-21 11:40:29 PST
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Alex Christensen
Created:
2018-12-21 11:40:29 PST
Size:
8.36 KB
patch
obsolete
>Index: Source/WebKit/ChangeLog >=================================================================== >--- Source/WebKit/ChangeLog (revision 239509) >+++ Source/WebKit/ChangeLog (working copy) >@@ -1,3 +1,24 @@ >+2018-12-21 Alex Christensen <achristensen@webkit.org> >+ >+ NetworkProcess should initialize its default NetworkSession with parameters from the UIProcess >+ https://bugs.webkit.org/show_bug.cgi?id=192967 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ I moved 3 of the NetworkProcessCreationParameters to use corresponding values of a WebsiteDataStoreParameters. >+ More will be moved in the near future, like indexedDatabaseDirectory. >+ >+ * NetworkProcess/NetworkProcess.cpp: >+ (WebKit::NetworkProcess::initializeNetworkProcess): >+ * NetworkProcess/NetworkProcessCreationParameters.cpp: >+ (WebKit::NetworkProcessCreationParameters::encode const): >+ (WebKit::NetworkProcessCreationParameters::decode): >+ * NetworkProcess/NetworkProcessCreationParameters.h: >+ * UIProcess/Cocoa/WebProcessPoolCocoa.mm: >+ (WebKit::WebProcessPool::platformInitializeNetworkProcess): >+ * UIProcess/WebProcessPool.cpp: >+ (WebKit::WebProcessPool::ensureNetworkProcess): >+ > 2018-12-20 Alex Christensen <achristensen@webkit.org> > > Remove unused NetworkProcessCreationParameters >Index: Source/WebKit/NetworkProcess/NetworkProcess.cpp >=================================================================== >--- Source/WebKit/NetworkProcess/NetworkProcess.cpp (revision 239507) >+++ Source/WebKit/NetworkProcess/NetworkProcess.cpp (working copy) >@@ -298,12 +298,8 @@ void NetworkProcess::initializeNetworkPr > if (parameters.shouldUseTestingNetworkSession) > NetworkStorageSession::switchToNewTestingSession(); > >- NetworkSessionCreationParameters sessionCreationParameters { }; >-#if PLATFORM(COCOA) >- sessionCreationParameters.httpProxy = URL(URL(), parameters.httpProxy); >- sessionCreationParameters.httpsProxy = URL(URL(), parameters.httpsProxy); >-#endif >- SessionTracker::setSession(PAL::SessionID::defaultSessionID(), NetworkSession::create(WTFMove(sessionCreationParameters))); >+ auto sessionID = parameters.defaultDataStoreParameters.networkSessionParameters.sessionID; >+ SessionTracker::setSession(sessionID, NetworkSession::create(WTFMove(parameters.defaultDataStoreParameters.networkSessionParameters))); > > #if ENABLE(INDEXED_DATABASE) > addIndexedDatabaseSession(PAL::SessionID::defaultSessionID(), parameters.indexedDatabaseDirectory, parameters.indexedDatabaseDirectoryExtensionHandle); >@@ -321,7 +317,7 @@ void NetworkProcess::initializeNetworkPr > #endif > > auto* defaultSession = SessionTracker::networkSession(PAL::SessionID::defaultSessionID()); >- for (const auto& cookie : parameters.defaultSessionPendingCookies) >+ for (const auto& cookie : parameters.defaultDataStoreParameters.pendingCookies) > defaultSession->networkStorageSession().setCookie(cookie); > > for (auto& supplement : m_supplements.values()) >Index: Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp >=================================================================== >--- Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp (revision 239507) >+++ Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp (working copy) >@@ -52,7 +52,6 @@ void NetworkProcessCreationParameters::e > #if PLATFORM(MAC) > encoder << uiProcessCookieStorageIdentifier; > #endif >- encoder << defaultSessionPendingCookies; > #if PLATFORM(IOS_FAMILY) > encoder << cookieStorageDirectoryExtensionHandle; > encoder << containerCachesDirectoryExtensionHandle; >@@ -70,12 +69,11 @@ void NetworkProcessCreationParameters::e > #if PLATFORM(IOS_FAMILY) > encoder << ctDataConnectionServiceType; > #endif >- encoder << httpProxy; >- encoder << httpsProxy; > IPC::encode(encoder, networkATSContext.get()); > encoder << storageAccessAPIEnabled; > encoder << suppressesConnectionTerminationOnSystemChange; > #endif >+ encoder << defaultDataStoreParameters; > #if USE(SOUP) > encoder << cookiePersistentStoragePath; > encoder << cookiePersistentStorageType; >@@ -134,8 +132,6 @@ bool NetworkProcessCreationParameters::d > if (!decoder.decode(result.uiProcessCookieStorageIdentifier)) > return false; > #endif >- if (!decoder.decode(result.defaultSessionPendingCookies)) >- return false; > #if PLATFORM(IOS_FAMILY) > Optional<SandboxExtension::Handle> cookieStorageDirectoryExtensionHandle; > decoder >> cookieStorageDirectoryExtensionHandle; >@@ -178,10 +174,6 @@ bool NetworkProcessCreationParameters::d > if (!decoder.decode(result.ctDataConnectionServiceType)) > return false; > #endif >- if (!decoder.decode(result.httpProxy)) >- return false; >- if (!decoder.decode(result.httpsProxy)) >- return false; > if (!IPC::decode(decoder, result.networkATSContext)) > return false; > if (!decoder.decode(result.storageAccessAPIEnabled)) >@@ -190,6 +182,12 @@ bool NetworkProcessCreationParameters::d > return false; > #endif > >+ Optional<WebsiteDataStoreParameters> defaultDataStoreParameters; >+ decoder >> defaultDataStoreParameters; >+ if (!defaultDataStoreParameters) >+ return false; >+ result.defaultDataStoreParameters = WTFMove(*defaultDataStoreParameters); >+ > #if USE(SOUP) > if (!decoder.decode(result.cookiePersistentStoragePath)) > return false; >Index: Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h >=================================================================== >--- Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h (revision 239507) >+++ Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h (working copy) >@@ -27,6 +27,7 @@ > > #include "CacheModel.h" > #include "SandboxExtension.h" >+#include "WebsiteDataStoreParameters.h" > #include <WebCore/Cookie.h> > #include <wtf/ProcessID.h> > #include <wtf/Vector.h> >@@ -62,7 +63,6 @@ struct NetworkProcessCreationParameters > #if PLATFORM(MAC) > Vector<uint8_t> uiProcessCookieStorageIdentifier; > #endif >- Vector<WebCore::Cookie> defaultSessionPendingCookies; > #if PLATFORM(IOS_FAMILY) > SandboxExtension::Handle cookieStorageDirectoryExtensionHandle; > SandboxExtension::Handle containerCachesDirectoryExtensionHandle; >@@ -82,13 +82,13 @@ struct NetworkProcessCreationParameters > #if PLATFORM(IOS_FAMILY) > String ctDataConnectionServiceType; > #endif >- String httpProxy; >- String httpsProxy; > RetainPtr<CFDataRef> networkATSContext; > bool storageAccessAPIEnabled; > bool suppressesConnectionTerminationOnSystemChange; > #endif > >+ WebsiteDataStoreParameters defaultDataStoreParameters; >+ > #if USE(SOUP) > String cookiePersistentStoragePath; > uint32_t cookiePersistentStorageType { 0 }; >Index: Source/WebKit/UIProcess/WebProcessPool.cpp >=================================================================== >--- Source/WebKit/UIProcess/WebProcessPool.cpp (revision 239507) >+++ Source/WebKit/UIProcess/WebProcessPool.cpp (working copy) >@@ -476,7 +476,7 @@ NetworkProcessProxy& WebProcessPool::ens > NetworkProcessCreationParameters parameters; > > if (m_websiteDataStore) { >- parameters.defaultSessionPendingCookies = copyToVector(m_websiteDataStore->websiteDataStore().pendingCookies()); >+ parameters.defaultDataStoreParameters.pendingCookies = copyToVector(m_websiteDataStore->websiteDataStore().pendingCookies()); > m_websiteDataStore->websiteDataStore().clearPendingCookies(); > } > >Index: Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm >=================================================================== >--- Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (revision 239507) >+++ Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (working copy) >@@ -264,8 +264,8 @@ void WebProcessPool::platformInitializeN > isSafari = WebCore::MacApplication::isSafari(); > #endif > if (isSafari) { >- parameters.httpProxy = [defaults stringForKey:(NSString *)WebKit2HTTPProxyDefaultsKey]; >- parameters.httpsProxy = [defaults stringForKey:(NSString *)WebKit2HTTPSProxyDefaultsKey]; >+ parameters.defaultDataStoreParameters.networkSessionParameters.httpProxy = URL(URL(), [defaults stringForKey:(NSString *)WebKit2HTTPProxyDefaultsKey]); >+ parameters.defaultDataStoreParameters.networkSessionParameters.httpsProxy = URL(URL(), [defaults stringForKey:(NSString *)WebKit2HTTPSProxyDefaultsKey]); > } > } >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
bfulgham
:
review+
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 192967
:
357912
| 357961