Diff
Modified: trunk/Source/WebCore/ChangeLog (240834 => 240835)
--- trunk/Source/WebCore/ChangeLog 2019-02-01 04:44:57 UTC (rev 240834)
+++ trunk/Source/WebCore/ChangeLog 2019-02-01 05:53:06 UTC (rev 240835)
@@ -1,3 +1,17 @@
+2019-01-31 Takashi Komori <[email protected]>
+
+ [Curl] Remove unnecessary member from NetworkStorageSession.
+ https://bugs.webkit.org/show_bug.cgi?id=194137
+
+ Reviewed by Don Olmstead.
+
+ No new tests since there is no behavior change.
+
+ * platform/network/NetworkStorageSession.h:
+ * platform/network/curl/NetworkStorageSessionCurl.cpp:
+ (WebCore::NetworkStorageSession::NetworkStorageSession):
+ (WebCore::NetworkStorageSession::context const): Deleted.
+
2019-01-31 Jer Noble <[email protected]>
NSInvalidArgumentException in [WebAVSampleBufferErrorListener observeValueForKeyPath:ofObject:change:context:]
Modified: trunk/Source/WebCore/platform/network/NetworkStorageSession.h (240834 => 240835)
--- trunk/Source/WebCore/platform/network/NetworkStorageSession.h 2019-02-01 04:44:57 UTC (rev 240834)
+++ trunk/Source/WebCore/platform/network/NetworkStorageSession.h 2019-02-01 05:53:06 UTC (rev 240835)
@@ -105,7 +105,7 @@
void getCredentialFromPersistentStorage(const ProtectionSpace&, GCancellable*, Function<void (Credential&&)>&& completionHandler);
void saveCredentialToPersistentStorage(const ProtectionSpace&, const Credential&);
#elif USE(CURL)
- WEBCORE_EXPORT NetworkStorageSession(PAL::SessionID, NetworkingContext*);
+ WEBCORE_EXPORT NetworkStorageSession(PAL::SessionID);
~NetworkStorageSession();
const CookieJarCurl& cookieStorage() const { return m_cookieStorage; };
@@ -113,8 +113,6 @@
WEBCORE_EXPORT void setCookieDatabase(UniqueRef<CookieJarDB>&&);
WEBCORE_EXPORT void setProxySettings(CurlProxySettings&&);
-
- NetworkingContext* context() const;
#else
WEBCORE_EXPORT NetworkStorageSession(PAL::SessionID, NetworkingContext*);
~NetworkStorageSession();
@@ -169,8 +167,6 @@
mutable std::unique_ptr<SoupNetworkSession> m_session;
Function<void ()> m_cookieObserverHandler;
#elif USE(CURL)
- RefPtr<NetworkingContext> m_context;
-
UniqueRef<CookieJarCurl> m_cookieStorage;
mutable UniqueRef<CookieJarDB> m_cookieDatabase;
#else
Modified: trunk/Source/WebCore/platform/network/curl/NetworkStorageSessionCurl.cpp (240834 => 240835)
--- trunk/Source/WebCore/platform/network/curl/NetworkStorageSessionCurl.cpp 2019-02-01 04:44:57 UTC (rev 240834)
+++ trunk/Source/WebCore/platform/network/curl/NetworkStorageSessionCurl.cpp 2019-02-01 05:53:06 UTC (rev 240835)
@@ -58,9 +58,8 @@
#endif
}
-NetworkStorageSession::NetworkStorageSession(PAL::SessionID sessionID, NetworkingContext* context)
+NetworkStorageSession::NetworkStorageSession(PAL::SessionID sessionID)
: m_sessionID(sessionID)
- , m_context(context)
, m_cookieStorage(makeUniqueRef<CookieJarCurl>())
, m_cookieDatabase(makeUniqueRef<CookieJarDB>(defaultCookieJarPath()))
{
@@ -70,11 +69,6 @@
{
}
-NetworkingContext* NetworkStorageSession::context() const
-{
- return m_context.get();
-}
-
void NetworkStorageSession::setCookieDatabase(UniqueRef<CookieJarDB>&& cookieDatabase)
{
m_cookieDatabase = WTFMove(cookieDatabase);
Modified: trunk/Source/WebKit/ChangeLog (240834 => 240835)
--- trunk/Source/WebKit/ChangeLog 2019-02-01 04:44:57 UTC (rev 240834)
+++ trunk/Source/WebKit/ChangeLog 2019-02-01 05:53:06 UTC (rev 240835)
@@ -1,3 +1,13 @@
+2019-01-31 Takashi Komori <[email protected]>
+
+ [Curl] Remove unnecessary member from NetworkStorageSession.
+ https://bugs.webkit.org/show_bug.cgi?id=194137
+
+ Reviewed by Don Olmstead.
+
+ * NetworkProcess/curl/NetworkProcessCurl.cpp:
+ (WebKit::NetworkProcess::platformCreateDefaultStorageSession const):
+
2019-01-31 Jiewen Tan <[email protected]>
Unreviewed, build fix after r240805
Modified: trunk/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp (240834 => 240835)
--- trunk/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp 2019-02-01 04:44:57 UTC (rev 240834)
+++ trunk/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp 2019-02-01 05:53:06 UTC (rev 240835)
@@ -41,7 +41,7 @@
std::unique_ptr<WebCore::NetworkStorageSession> NetworkProcess::platformCreateDefaultStorageSession() const
{
- return std::make_unique<WebCore::NetworkStorageSession>(PAL::SessionID::defaultSessionID(), nullptr);
+ return std::make_unique<WebCore::NetworkStorageSession>(PAL::SessionID::defaultSessionID());
}
void NetworkProcess::allowSpecificHTTPSCertificateForHost(const CertificateInfo& certificateInfo, const String& host)
Modified: trunk/Source/WebKitLegacy/ChangeLog (240834 => 240835)
--- trunk/Source/WebKitLegacy/ChangeLog 2019-02-01 04:44:57 UTC (rev 240834)
+++ trunk/Source/WebKitLegacy/ChangeLog 2019-02-01 05:53:06 UTC (rev 240835)
@@ -1,5 +1,16 @@
2019-01-31 Takashi Komori <[email protected]>
+ [Curl] Remove unnecessary member from NetworkStorageSession.
+ https://bugs.webkit.org/show_bug.cgi?id=194137
+
+ Reviewed by Don Olmstead.
+
+ * WebCoreSupport/NetworkStorageSessionMap.cpp:
+ (NetworkStorageSessionMap::defaultStorageSession):
+ (NetworkStorageSessionMap::ensureSession):
+
+2019-01-31 Takashi Komori <[email protected]>
+
[Curl] Fix DRT crash related to private browsing.
https://bugs.webkit.org/show_bug.cgi?id=193816
Modified: trunk/Source/WebKitLegacy/WebCoreSupport/NetworkStorageSessionMap.cpp (240834 => 240835)
--- trunk/Source/WebKitLegacy/WebCoreSupport/NetworkStorageSessionMap.cpp 2019-02-01 04:44:57 UTC (rev 240834)
+++ trunk/Source/WebKitLegacy/WebCoreSupport/NetworkStorageSessionMap.cpp 2019-02-01 05:53:06 UTC (rev 240835)
@@ -54,13 +54,8 @@
WebCore::NetworkStorageSession& NetworkStorageSessionMap::defaultStorageSession()
{
- if (!defaultNetworkStorageSession()) {
-#if USE(CURL)
- defaultNetworkStorageSession() = std::make_unique<WebCore::NetworkStorageSession>(PAL::SessionID::defaultSessionID(), nullptr);
-#else
+ if (!defaultNetworkStorageSession())
defaultNetworkStorageSession() = std::make_unique<WebCore::NetworkStorageSession>(PAL::SessionID::defaultSessionID());
-#endif
- }
return *defaultNetworkStorageSession();
}
@@ -109,7 +104,7 @@
#elif USE(CURL)
globalSessionMap().ensure(sessionID, [sessionID] {
- return std::make_unique<WebCore::NetworkStorageSession>(sessionID, nullptr);
+ return std::make_unique<WebCore::NetworkStorageSession>(sessionID);
});
#endif
}
