Changeset 201972 in webkit

Timestamp:

Jun 11, 2016 10:58:51 AM (8 years ago)

Author:

Antti Koivisto

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.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/NetworkStorageSession.cpp (modified) (1 diff)
• platform/network/NetworkStorageSession.h (modified) (2 diffs)
• platform/network/NetworkStorageSessionStub.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-06-11  Antti Koivisto  <antti@apple.com>
+
+        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  <mmaxfield@apple.com>
 

trunk/Source/WebCore/platform/network/NetworkStorageSession.cpp

@@ -27 +27 @@
 #include "NetworkStorageSession.h"
 
+#include "NetworkingContext.h"
 #include <wtf/HashMap.h>
 #include <wtf/MainThread.h>

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

@@ -67 +67 @@
     SoupNetworkSession& soupNetworkSession() const;
     void setSoupNetworkSession(std::unique_ptr<SoupNetworkSession>);
+#else
+    NetworkStorageSession(SessionID, NetworkingContext*);
+
+    NetworkingContext* context() const;
 #endif
 
@@ -80 +84 @@
 #elif USE(SOUP)
     std::unique_ptr<SoupNetworkSession> m_session;
+#else
+    RefPtr<NetworkingContext> m_context;
 #endif
 

trunk/Source/WebCore/platform/network/NetworkStorageSessionStub.cpp

@@ -36 +36 @@
 
 NetworkStorageSession::NetworkStorageSession(SessionID sessionID, NetworkingContext* context)
-    : m_sessionID(sessionID)
-    , m_context(context)
+    : NetworkStorageSession(sessionID)
 {
-}
-
-NetworkStorageSession::~NetworkStorageSession()
-{
+    m_context = context;
 }
 
@@ -56 +52 @@
 }
 
-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()
 {