Changeset 240835 in webkit


Ignore:
Timestamp:
Jan 31, 2019 9:53:06 PM (5 years ago)
Author:
commit-queue@webkit.org
Message:

[Curl] Remove unnecessary member from NetworkStorageSession.
​https://bugs.webkit.org/show_bug.cgi?id=194137

Patch by Takashi Komori <​Takashi.Komori@sony.com> on 2019-01-31
Reviewed by Don Olmstead.

Source/WebCore:

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.

Source/WebKit:

  • NetworkProcess/curl/NetworkProcessCurl.cpp:

(WebKit::NetworkProcess::platformCreateDefaultStorageSession const):

Source/WebKitLegacy:

  • WebCoreSupport/NetworkStorageSessionMap.cpp:

(NetworkStorageSessionMap::defaultStorageSession):
(NetworkStorageSessionMap::ensureSession):

Location:
trunk/Source
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r240834 r240835  
     12019-01-31  Takashi Komori  <Takashi.Komori@sony.com>
     2
     3        [Curl] Remove unnecessary member from NetworkStorageSession.
     4        https://bugs.webkit.org/show_bug.cgi?id=194137
     5
     6        Reviewed by Don Olmstead.
     7
     8        No new tests since there is no behavior change.
     9
     10        * platform/network/NetworkStorageSession.h:
     11        * platform/network/curl/NetworkStorageSessionCurl.cpp:
     12        (WebCore::NetworkStorageSession::NetworkStorageSession):
     13        (WebCore::NetworkStorageSession::context const): Deleted.
     14
    1152019-01-31  Jer Noble  <jer.noble@apple.com>
    216

  • trunk/Source/WebCore/platform/network/NetworkStorageSession.h

    r240340 r240835  
    106106    void saveCredentialToPersistentStorage(const ProtectionSpace&, const Credential&);
    107107#elif USE(CURL)
    108     WEBCORE_EXPORT NetworkStorageSession(PAL::SessionID, NetworkingContext*);
     108    WEBCORE_EXPORT NetworkStorageSession(PAL::SessionID);
    109109    ~NetworkStorageSession();
    110110
    … …  
    114114
    115115    WEBCORE_EXPORT void setProxySettings(CurlProxySettings&&);
    116 
    117     NetworkingContext* context() const;
    118116#else
    119117    WEBCORE_EXPORT NetworkStorageSession(PAL::SessionID, NetworkingContext*);
    … …  
    170168    Function<void ()> m_cookieObserverHandler;
    171169#elif USE(CURL)
    172     RefPtr<NetworkingContext> m_context;
    173 
    174170    UniqueRef<CookieJarCurl> m_cookieStorage;
    175171    mutable UniqueRef<CookieJarDB> m_cookieDatabase;

  • trunk/Source/WebCore/platform/network/curl/NetworkStorageSessionCurl.cpp

    r240437 r240835  
    5959}
    6060
    61 NetworkStorageSession::NetworkStorageSession(PAL::SessionID sessionID, NetworkingContext* context)
     61NetworkStorageSession::NetworkStorageSession(PAL::SessionID sessionID)
    6262    : m_sessionID(sessionID)
    63     , m_context(context)
    6463    , m_cookieStorage(makeUniqueRef<CookieJarCurl>())
    6564    , m_cookieDatabase(makeUniqueRef<CookieJarDB>(defaultCookieJarPath()))
    … …  
    6968NetworkStorageSession::~NetworkStorageSession()
    7069{
    71 }
    72 
    73 NetworkingContext* NetworkStorageSession::context() const
    74 {
    75     return m_context.get();
    7670}
    7771

  • trunk/Source/WebKit/ChangeLog

    r240828 r240835  
     12019-01-31  Takashi Komori  <Takashi.Komori@sony.com>
     2
     3        [Curl] Remove unnecessary member from NetworkStorageSession.
     4        https://bugs.webkit.org/show_bug.cgi?id=194137
     5
     6        Reviewed by Don Olmstead.
     7
     8        * NetworkProcess/curl/NetworkProcessCurl.cpp:
     9        (WebKit::NetworkProcess::platformCreateDefaultStorageSession const):
     10
    1112019-01-31  Jiewen Tan  <jiewen_tan@apple.com>
    212

  • trunk/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp

    r240405 r240835  
    4242std::unique_ptr<WebCore::NetworkStorageSession> NetworkProcess::platformCreateDefaultStorageSession() const
    4343{
    44     return std::make_unique<WebCore::NetworkStorageSession>(PAL::SessionID::defaultSessionID(), nullptr);
     44    return std::make_unique<WebCore::NetworkStorageSession>(PAL::SessionID::defaultSessionID());
    4545}
    4646

  • trunk/Source/WebKitLegacy/ChangeLog

    r240791 r240835  
     12019-01-31  Takashi Komori  <Takashi.Komori@sony.com>
     2
     3        [Curl] Remove unnecessary member from NetworkStorageSession.
     4        https://bugs.webkit.org/show_bug.cgi?id=194137
     5
     6        Reviewed by Don Olmstead.
     7
     8        * WebCoreSupport/NetworkStorageSessionMap.cpp:
     9        (NetworkStorageSessionMap::defaultStorageSession):
     10        (NetworkStorageSessionMap::ensureSession):
     11
    1122019-01-31  Takashi Komori  <Takashi.Komori@sony.com>
    213

  • trunk/Source/WebKitLegacy/WebCoreSupport/NetworkStorageSessionMap.cpp

    r240791 r240835  
    5555WebCore::NetworkStorageSession& NetworkStorageSessionMap::defaultStorageSession()
    5656{
    57     if (!defaultNetworkStorageSession()) {
    58 #if USE(CURL)
    59         defaultNetworkStorageSession() = std::make_unique<WebCore::NetworkStorageSession>(PAL::SessionID::defaultSessionID(), nullptr);
    60 #else
     57    if (!defaultNetworkStorageSession())
    6158        defaultNetworkStorageSession() = std::make_unique<WebCore::NetworkStorageSession>(PAL::SessionID::defaultSessionID());
    62 #endif
    63     }
    6459    return *defaultNetworkStorageSession();
    6560}
    … …  
    110105#elif USE(CURL)
    111106    globalSessionMap().ensure(sessionID, [sessionID] {
    112         return std::make_unique<WebCore::NetworkStorageSession>(sessionID, nullptr);
     107        return std::make_unique<WebCore::NetworkStorageSession>(sessionID);
    113108    });
    114109#endif
Note: See TracChangeset for help on using the changeset viewer.