Title: [201972] trunk/Source/WebCore
- Revision
- 201972
- Author
- [email protected]
- Date
- 2016-06-11 10:58:51 -0700 (Sat, 11 Jun 2016)
Log Message
WinCairo build fix attempt.
* platform/network/NetworkStorageSession.cpp:
* platform/network/NetworkStorageSession.h:
* platform/network/NetworkStorageSessionStub.cpp:
(WebCore::NetworkStorageSession::NetworkStorageSession):
(WebCore::NetworkStorageSession::context):
(WebCore::NetworkStorageSession::createPrivateBrowsingSession):
(WebCore::NetworkStorageSession::switchToNewTestingSession):
(WebCore::NetworkStorageSession::~NetworkStorageSession): Deleted.
(WebCore::defaultSession): Deleted.
(WebCore::NetworkStorageSession::defaultStorageSession): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (201971 => 201972)
--- trunk/Source/WebCore/ChangeLog 2016-06-11 17:52:35 UTC (rev 201971)
+++ trunk/Source/WebCore/ChangeLog 2016-06-11 17:58:51 UTC (rev 201972)
@@ -1,3 +1,18 @@
+2016-06-11 Antti Koivisto <[email protected]>
+
+ WinCairo build fix attempt.
+
+ * platform/network/NetworkStorageSession.cpp:
+ * platform/network/NetworkStorageSession.h:
+ * platform/network/NetworkStorageSessionStub.cpp:
+ (WebCore::NetworkStorageSession::NetworkStorageSession):
+ (WebCore::NetworkStorageSession::context):
+ (WebCore::NetworkStorageSession::createPrivateBrowsingSession):
+ (WebCore::NetworkStorageSession::switchToNewTestingSession):
+ (WebCore::NetworkStorageSession::~NetworkStorageSession): Deleted.
+ (WebCore::defaultSession): Deleted.
+ (WebCore::NetworkStorageSession::defaultStorageSession): Deleted.
+
2016-06-11 Myles C. Maxfield <[email protected]>
Deleting a CSSOM style rule invalidates any previously-added FontFaces
Modified: trunk/Source/WebCore/platform/network/NetworkStorageSession.cpp (201971 => 201972)
--- trunk/Source/WebCore/platform/network/NetworkStorageSession.cpp 2016-06-11 17:52:35 UTC (rev 201971)
+++ trunk/Source/WebCore/platform/network/NetworkStorageSession.cpp 2016-06-11 17:58:51 UTC (rev 201972)
@@ -26,6 +26,7 @@
#include "config.h"
#include "NetworkStorageSession.h"
+#include "NetworkingContext.h"
#include <wtf/HashMap.h>
#include <wtf/MainThread.h>
#include <wtf/NeverDestroyed.h>
Modified: trunk/Source/WebCore/platform/network/NetworkStorageSession.h (201971 => 201972)
--- trunk/Source/WebCore/platform/network/NetworkStorageSession.h 2016-06-11 17:52:35 UTC (rev 201971)
+++ trunk/Source/WebCore/platform/network/NetworkStorageSession.h 2016-06-11 17:58:51 UTC (rev 201972)
@@ -66,6 +66,10 @@
SoupNetworkSession& soupNetworkSession() const;
void setSoupNetworkSession(std::unique_ptr<SoupNetworkSession>);
+#else
+ NetworkStorageSession(SessionID, NetworkingContext*);
+
+ NetworkingContext* context() const;
#endif
private:
@@ -79,6 +83,8 @@
RetainPtr<CFURLStorageSessionRef> m_platformSession;
#elif USE(SOUP)
std::unique_ptr<SoupNetworkSession> m_session;
+#else
+ RefPtr<NetworkingContext> m_context;
#endif
CredentialStorage m_credentialStorage;
Modified: trunk/Source/WebCore/platform/network/NetworkStorageSessionStub.cpp (201971 => 201972)
--- trunk/Source/WebCore/platform/network/NetworkStorageSessionStub.cpp 2016-06-11 17:52:35 UTC (rev 201971)
+++ trunk/Source/WebCore/platform/network/NetworkStorageSessionStub.cpp 2016-06-11 17:58:51 UTC (rev 201972)
@@ -35,15 +35,11 @@
namespace WebCore {
NetworkStorageSession::NetworkStorageSession(SessionID sessionID, NetworkingContext* context)
- : m_sessionID(sessionID)
- , m_context(context)
+ : NetworkStorageSession(sessionID)
{
+ m_context = context;
}
-NetworkStorageSession::~NetworkStorageSession()
-{
-}
-
NetworkingContext* NetworkStorageSession::context() const
{
return m_context.get();
@@ -55,19 +51,6 @@
return nullptr;
}
-static std::unique_ptr<NetworkStorageSession>& defaultSession()
-{
- static NeverDestroyed<std::unique_ptr<NetworkStorageSession>> session;
- return session;
-}
-
-NetworkStorageSession& NetworkStorageSession::defaultStorageSession()
-{
- if (!defaultSession())
- defaultSession() = std::make_unique<NetworkStorageSession>(SessionID::defaultSessionID(), nullptr);
- return *defaultSession();
-}
-
void NetworkStorageSession::switchToNewTestingSession()
{
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
