Diff
Modified: trunk/Source/WebKit/ChangeLog (239623 => 239624)
--- trunk/Source/WebKit/ChangeLog 2019-01-04 19:02:19 UTC (rev 239623)
+++ trunk/Source/WebKit/ChangeLog 2019-01-04 19:07:13 UTC (rev 239624)
@@ -1,3 +1,29 @@
+2019-01-04 Fujii Hironori <[email protected]>
+
+ [curl] Move cookiePersistentStorageFile from NetworkProcessCreationParameters to NetworkSessionCreationParameters
+ https://bugs.webkit.org/show_bug.cgi?id=192970
+
+ Reviewed by Alex Christensen.
+
+ * NetworkProcess/NetworkProcessCreationParameters.cpp:
+ (WebKit::NetworkProcessCreationParameters::encode const): Removed code for cookiePersistentStorageFile.
+ (WebKit::NetworkProcessCreationParameters::decode): Ditto.
+ * NetworkProcess/NetworkProcessCreationParameters.h: Ditto.
+ * NetworkProcess/curl/NetworkProcessCurl.cpp:
+ (WebKit::NetworkProcess::platformInitializeNetworkProcess): Ditto.
+
+ * NetworkProcess/NetworkSessionCreationParameters.cpp:
+ (WebKit::NetworkSessionCreationParameters::privateSessionParameters): Added code for cookiePersistentStorageFile.
+ (WebKit::NetworkSessionCreationParameters::encode const): Ditto.
+ (WebKit::NetworkSessionCreationParameters::decode): Ditto.
+ * NetworkProcess/NetworkSessionCreationParameters.h: Ditto.
+ * NetworkProcess/curl/NetworkSessionCurl.cpp:
+ (WebKit::NetworkSessionCurl::NetworkSessionCurl): Ditto.
+
+ * NetworkProcess/Cookies/WebCookieManager.h: Removed setCookiePersistentStorage method of curl port extension.
+ * NetworkProcess/Cookies/curl/WebCookieManagerCurl.cpp:
+ (WebKit::WebCookieManager::setCookiePersistentStorage): Deleted.
+
2019-01-04 Chris Dumez <[email protected]>
[PSON] Calling history.back() from inside the load event handler prevents process-swapping
Modified: trunk/Source/WebKit/NetworkProcess/Cookies/WebCookieManager.h (239623 => 239624)
--- trunk/Source/WebKit/NetworkProcess/Cookies/WebCookieManager.h 2019-01-04 19:02:19 UTC (rev 239623)
+++ trunk/Source/WebKit/NetworkProcess/Cookies/WebCookieManager.h 2019-01-04 19:07:13 UTC (rev 239624)
@@ -59,8 +59,6 @@
#if USE(SOUP)
void setCookiePersistentStorage(const String& storagePath, uint32_t storageType);
-#elif USE(CURL)
- void setCookiePersistentStorage(const String& storagePath);
#endif
void notifyCookiesDidChange(PAL::SessionID);
Modified: trunk/Source/WebKit/NetworkProcess/Cookies/curl/WebCookieManagerCurl.cpp (239623 => 239624)
--- trunk/Source/WebKit/NetworkProcess/Cookies/curl/WebCookieManagerCurl.cpp 2019-01-04 19:02:19 UTC (rev 239623)
+++ trunk/Source/WebKit/NetworkProcess/Cookies/curl/WebCookieManagerCurl.cpp 2019-01-04 19:07:13 UTC (rev 239624)
@@ -26,11 +26,6 @@
#include "config.h"
#include "WebCookieManager.h"
-#include "ChildProcess.h"
-#include <WebCore/CookieJarDB.h>
-#include <WebCore/NetworkStorageSession.h>
-#include <wtf/text/CString.h>
-
namespace WebKit {
using namespace WebCore;
@@ -44,10 +39,4 @@
return HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain;
}
-void WebCookieManager::setCookiePersistentStorage(const String& storagePath)
-{
- auto& storageSession = NetworkStorageSession::defaultStorageSession();
- storageSession.setCookieDatabase(makeUniqueRef<CookieJarDB>(storagePath));
-}
-
} // namespace WebKit
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp (239623 => 239624)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp 2019-01-04 19:02:19 UTC (rev 239623)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp 2019-01-04 19:07:13 UTC (rev 239624)
@@ -81,8 +81,6 @@
encoder << ignoreTLSErrors;
encoder << languages;
encoder << proxySettings;
-#elif USE(CURL)
- encoder << cookiePersistentStorageFile;
#endif
encoder << urlSchemesRegisteredAsSecure;
@@ -201,9 +199,6 @@
return false;
if (!decoder.decode(result.proxySettings))
return false;
-#elif USE(CURL)
- if (!decoder.decode(result.cookiePersistentStorageFile))
- return false;
#endif
if (!decoder.decode(result.urlSchemesRegisteredAsSecure))
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h (239623 => 239624)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h 2019-01-04 19:02:19 UTC (rev 239623)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h 2019-01-04 19:07:13 UTC (rev 239624)
@@ -96,8 +96,6 @@
bool ignoreTLSErrors { false };
Vector<String> languages;
WebCore::SoupNetworkProxySettings proxySettings;
-#elif USE(CURL)
- String cookiePersistentStorageFile;
#endif
Vector<String> urlSchemesRegisteredAsSecure;
Modified: trunk/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.cpp (239623 => 239624)
--- trunk/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.cpp 2019-01-04 19:02:19 UTC (rev 239623)
+++ trunk/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.cpp 2019-01-04 19:07:13 UTC (rev 239624)
@@ -45,7 +45,7 @@
, { }, { }, { }, false, { }, { }, { }
#endif
#if USE(CURL)
- , { }
+ , { }, { }
#endif
};
}
@@ -65,6 +65,7 @@
encoder << httpsProxy;
#endif
#if USE(CURL)
+ encoder << cookiePersistentStorageFile;
encoder << proxySettings;
#endif
}
@@ -122,6 +123,11 @@
#endif
#if USE(CURL)
+ Optional<String> cookiePersistentStorageFile;
+ decoder >> cookiePersistentStorageFile;
+ if (!cookiePersistentStorageFile)
+ return WTF::nullopt;
+
Optional<WebCore::CurlProxySettings> proxySettings;
decoder >> proxySettings;
if (!proxySettings)
@@ -142,6 +148,7 @@
, WTFMove(*httpsProxy)
#endif
#if USE(CURL)
+ , WTFMove(*cookiePersistentStorageFile)
, WTFMove(*proxySettings)
#endif
}};
Modified: trunk/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.h (239623 => 239624)
--- trunk/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.h 2019-01-04 19:02:19 UTC (rev 239623)
+++ trunk/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.h 2019-01-04 19:07:13 UTC (rev 239624)
@@ -66,6 +66,7 @@
URL httpsProxy;
#endif
#if USE(CURL)
+ String cookiePersistentStorageFile;
WebCore::CurlProxySettings proxySettings;
#endif
};
Modified: trunk/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp (239623 => 239624)
--- trunk/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp 2019-01-04 19:02:19 UTC (rev 239623)
+++ trunk/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp 2019-01-04 19:07:13 UTC (rev 239624)
@@ -27,7 +27,6 @@
#include "NetworkProcess.h"
#include "NetworkProcessCreationParameters.h"
-#include "WebCookieManager.h"
#include <WebCore/CurlContext.h>
#include <WebCore/NetworkStorageSession.h>
#include <WebCore/NotImplemented.h>
@@ -36,10 +35,8 @@
using namespace WebCore;
-void NetworkProcess::platformInitializeNetworkProcess(const NetworkProcessCreationParameters& parameters)
+void NetworkProcess::platformInitializeNetworkProcess(const NetworkProcessCreationParameters&)
{
- if (!parameters.cookiePersistentStorageFile.isEmpty())
- supplement<WebCookieManager>()->setCookiePersistentStorage(parameters.cookiePersistentStorageFile);
}
void NetworkProcess::allowSpecificHTTPSCertificateForHost(const CertificateInfo& certificateInfo, const String& host)
Modified: trunk/Source/WebKit/NetworkProcess/curl/NetworkSessionCurl.cpp (239623 => 239624)
--- trunk/Source/WebKit/NetworkProcess/curl/NetworkSessionCurl.cpp 2019-01-04 19:02:19 UTC (rev 239623)
+++ trunk/Source/WebKit/NetworkProcess/curl/NetworkSessionCurl.cpp 2019-01-04 19:07:13 UTC (rev 239624)
@@ -26,7 +26,10 @@
#include "config.h"
#include "NetworkSessionCurl.h"
+#include "NetworkProcess.h"
#include "NetworkSessionCreationParameters.h"
+#include "WebCookieManager.h"
+#include <WebCore/CookieJarDB.h>
#include <WebCore/CurlContext.h>
#include <WebCore/NetworkStorageSession.h>
@@ -37,6 +40,8 @@
NetworkSessionCurl::NetworkSessionCurl(NetworkSessionCreationParameters&& parameters)
: NetworkSession(parameters.sessionID)
{
+ if (!parameters.cookiePersistentStorageFile.isEmpty())
+ networkStorageSession().setCookieDatabase(makeUniqueRef<CookieJarDB>(parameters.cookiePersistentStorageFile));
networkStorageSession().setProxySettings(WTFMove(parameters.proxySettings));
}
