WebKit Bugzilla
Attachment 360826 Details for
Bug 194137
: [Curl] Remove unnecessary member from NetworkStorageSession.
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-194137-20190201134845.patch (text/plain), 7.19 KB, created by
Takashi Komori
on 2019-01-31 20:51:35 PST
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Takashi Komori
Created:
2019-01-31 20:51:35 PST
Size:
7.19 KB
patch
obsolete
>Subversion Revision: 240792 >diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog >index 38edd5d0c1a4be34e9e6f5e6c4a300c3163679b4..a5921890ca6caa7da027b13cbfa89ad37860a271 100644 >--- a/Source/WebCore/ChangeLog >+++ b/Source/WebCore/ChangeLog >@@ -1,3 +1,17 @@ >+2019-01-31 Takashi Komori <Takashi.Komori@sony.com> >+ >+ [Curl] Remove unnecessary member from NetworkStorageSession. >+ https://bugs.webkit.org/show_bug.cgi?id=194137 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ 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 Alicia Boya GarcÃa <aboya@igalia.com> > > [MSE][GStreamer] Use reference instead of pointer in m_playerPrivate >diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog >index dd09e1bcd77c13904f0edef65253f119395e0a05..af185d573e8d839fa2f1666e5f12ee31a144e413 100644 >--- a/Source/WebKit/ChangeLog >+++ b/Source/WebKit/ChangeLog >@@ -1,3 +1,13 @@ >+2019-01-31 Takashi Komori <Takashi.Komori@sony.com> >+ >+ [Curl] Remove unnecessary member from NetworkStorageSession. >+ https://bugs.webkit.org/show_bug.cgi?id=194137 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * NetworkProcess/curl/NetworkProcessCurl.cpp: >+ (WebKit::NetworkProcess::platformCreateDefaultStorageSession const): >+ > 2019-01-30 Simon Fraser <simon.fraser@apple.com> > > [Mac] Implement basic hit testing in the scrolling tree >diff --git a/Source/WebKitLegacy/ChangeLog b/Source/WebKitLegacy/ChangeLog >index 174fb6b572e100208716e8bc483f77439edcac1e..47ddaff7189745b9bca0de0d14b767e66dfd862f 100644 >--- a/Source/WebKitLegacy/ChangeLog >+++ b/Source/WebKitLegacy/ChangeLog >@@ -1,5 +1,16 @@ > 2019-01-31 Takashi Komori <Takashi.Komori@sony.com> > >+ [Curl] Remove unnecessary member from NetworkStorageSession. >+ https://bugs.webkit.org/show_bug.cgi?id=194137 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * WebCoreSupport/NetworkStorageSessionMap.cpp: >+ (NetworkStorageSessionMap::defaultStorageSession): >+ (NetworkStorageSessionMap::ensureSession): >+ >+2019-01-31 Takashi Komori <Takashi.Komori@sony.com> >+ > [Curl] Fix DRT crash related to private browsing. > https://bugs.webkit.org/show_bug.cgi?id=193816 > >diff --git a/Source/WebCore/platform/network/NetworkStorageSession.h b/Source/WebCore/platform/network/NetworkStorageSession.h >index 07896874262e21146f4ad026a2d6de52c837f4e1..014e1c6d93a4689f6e9fb20b8ae82f957dd29e7c 100644 >--- a/Source/WebCore/platform/network/NetworkStorageSession.h >+++ b/Source/WebCore/platform/network/NetworkStorageSession.h >@@ -105,7 +105,7 @@ public: > 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 @@ public: > 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 @@ private: > 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 >diff --git a/Source/WebCore/platform/network/curl/NetworkStorageSessionCurl.cpp b/Source/WebCore/platform/network/curl/NetworkStorageSessionCurl.cpp >index 05b567232bbd66f0bd071ddb8a0f0cdaff6efaa9..1ac4e02b7cb0752df22e6cbb38944f1acf861292 100644 >--- a/Source/WebCore/platform/network/curl/NetworkStorageSessionCurl.cpp >+++ b/Source/WebCore/platform/network/curl/NetworkStorageSessionCurl.cpp >@@ -58,9 +58,8 @@ static String defaultCookieJarPath() > #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 @@ NetworkStorageSession::~NetworkStorageSession() > { > } > >-NetworkingContext* NetworkStorageSession::context() const >-{ >- return m_context.get(); >-} >- > void NetworkStorageSession::setCookieDatabase(UniqueRef<CookieJarDB>&& cookieDatabase) > { > m_cookieDatabase = WTFMove(cookieDatabase); >diff --git a/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp b/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp >index 91ffa49b37a2bb505e599a6ecc1ffdf984c0ef58..be6801f30cdf4900254c224b9b11fbdf73fe2e31 100644 >--- a/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp >+++ b/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp >@@ -41,7 +41,7 @@ void NetworkProcess::platformInitializeNetworkProcess(const NetworkProcessCreati > > 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) >diff --git a/Source/WebKitLegacy/WebCoreSupport/NetworkStorageSessionMap.cpp b/Source/WebKitLegacy/WebCoreSupport/NetworkStorageSessionMap.cpp >index e5ae80758010b5cb2cbf1b99a5ed6ce10731bbac..43ea45dae89206c829a514d4da8e3d1c97cc1284 100644 >--- a/Source/WebKitLegacy/WebCoreSupport/NetworkStorageSessionMap.cpp >+++ b/Source/WebKitLegacy/WebCoreSupport/NetworkStorageSessionMap.cpp >@@ -54,13 +54,8 @@ WebCore::NetworkStorageSession* NetworkStorageSessionMap::storageSession(const P > > 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 @@ void NetworkStorageSessionMap::ensureSession(const PAL::SessionID& sessionID, co > > #elif USE(CURL) > globalSessionMap().ensure(sessionID, [sessionID] { >- return std::make_unique<WebCore::NetworkStorageSession>(sessionID, nullptr); >+ return std::make_unique<WebCore::NetworkStorageSession>(sessionID); > }); > #endif > }
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
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 194137
: 360826