Changeset 201972 in webkit
- Timestamp:
- Jun 11, 2016 10:58:51 AM (8 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r201971 r201972 1 2016-06-11 Antti Koivisto <antti@apple.com> 2 3 WinCairo build fix attempt. 4 5 * platform/network/NetworkStorageSession.cpp: 6 * platform/network/NetworkStorageSession.h: 7 * platform/network/NetworkStorageSessionStub.cpp: 8 (WebCore::NetworkStorageSession::NetworkStorageSession): 9 (WebCore::NetworkStorageSession::context): 10 (WebCore::NetworkStorageSession::createPrivateBrowsingSession): 11 (WebCore::NetworkStorageSession::switchToNewTestingSession): 12 (WebCore::NetworkStorageSession::~NetworkStorageSession): Deleted. 13 (WebCore::defaultSession): Deleted. 14 (WebCore::NetworkStorageSession::defaultStorageSession): Deleted. 15 1 16 2016-06-11 Myles C. Maxfield <mmaxfield@apple.com> 2 17 -
trunk/Source/WebCore/platform/network/NetworkStorageSession.cpp
r201967 r201972 27 27 #include "NetworkStorageSession.h" 28 28 29 #include "NetworkingContext.h" 29 30 #include <wtf/HashMap.h> 30 31 #include <wtf/MainThread.h> -
trunk/Source/WebCore/platform/network/NetworkStorageSession.h
r201967 r201972 67 67 SoupNetworkSession& soupNetworkSession() const; 68 68 void setSoupNetworkSession(std::unique_ptr<SoupNetworkSession>); 69 #else 70 NetworkStorageSession(SessionID, NetworkingContext*); 71 72 NetworkingContext* context() const; 69 73 #endif 70 74 … … 80 84 #elif USE(SOUP) 81 85 std::unique_ptr<SoupNetworkSession> m_session; 86 #else 87 RefPtr<NetworkingContext> m_context; 82 88 #endif 83 89 -
trunk/Source/WebCore/platform/network/NetworkStorageSessionStub.cpp
r198083 r201972 36 36 37 37 NetworkStorageSession::NetworkStorageSession(SessionID sessionID, NetworkingContext* context) 38 : m_sessionID(sessionID) 39 , m_context(context) 38 : NetworkStorageSession(sessionID) 40 39 { 41 } 42 43 NetworkStorageSession::~NetworkStorageSession() 44 { 40 m_context = context; 45 41 } 46 42 … … 56 52 } 57 53 58 static std::unique_ptr<NetworkStorageSession>& defaultSession()59 {60 static NeverDestroyed<std::unique_ptr<NetworkStorageSession>> session;61 return session;62 }63 64 NetworkStorageSession& NetworkStorageSession::defaultStorageSession()65 {66 if (!defaultSession())67 defaultSession() = std::make_unique<NetworkStorageSession>(SessionID::defaultSessionID(), nullptr);68 return *defaultSession();69 }70 71 54 void NetworkStorageSession::switchToNewTestingSession() 72 55 {
Note: See TracChangeset
for help on using the changeset viewer.