Diff
Modified: trunk/Source/WebKit/ChangeLog (227681 => 227682)
--- trunk/Source/WebKit/ChangeLog 2018-01-26 17:50:32 UTC (rev 227681)
+++ trunk/Source/WebKit/ChangeLog 2018-01-26 18:36:32 UTC (rev 227682)
@@ -1,3 +1,41 @@
+2018-01-26 Alex Christensen <[email protected]>
+
+ Clean up more networking code
+ https://bugs.webkit.org/show_bug.cgi?id=182161
+
+ Reviewed by Anders Carlsson.
+
+ Two cleanups:
+ 1. The WebProcess doesn't need to initialize NetworkSessions.
+ 2. WebFrameNetworkingContext doesn't need to have the NetworkingContext functions to support ResourceHandles in WebKit any more.
+
+ * NetworkProcess/NetworkConnectionToWebProcess.cpp:
+ * NetworkProcess/NetworkLoad.h:
+ * NetworkProcess/RemoteNetworkingContext.h:
+ (): Deleted.
+ * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+ * NetworkProcess/curl/RemoteNetworkingContextCurl.cpp:
+ (WebKit::RemoteNetworkingContext::~RemoteNetworkingContext): Deleted.
+ (WebKit::RemoteNetworkingContext::isValid const): Deleted.
+ (WebKit::RemoteNetworkingContext::storageSession const): Deleted.
+ * NetworkProcess/mac/RemoteNetworkingContext.mm:
+ (WebKit::RemoteNetworkingContext::~RemoteNetworkingContext): Deleted.
+ (WebKit::RemoteNetworkingContext::isValid const): Deleted.
+ (WebKit::RemoteNetworkingContext::localFileContentSniffingEnabled const): Deleted.
+ (WebKit::RemoteNetworkingContext::storageSession const): Deleted.
+ (WebKit::RemoteNetworkingContext::sourceApplicationAuditData const): Deleted.
+ (WebKit::RemoteNetworkingContext::sourceApplicationIdentifier const): Deleted.
+ (WebKit::RemoteNetworkingContext::blockedError const): Deleted.
+ * NetworkProcess/soup/RemoteNetworkingContextSoup.cpp:
+ (WebKit::RemoteNetworkingContext::~RemoteNetworkingContext): Deleted.
+ (WebKit::RemoteNetworkingContext::isValid const): Deleted.
+ (WebKit::RemoteNetworkingContext::storageSession const): Deleted.
+ * WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm:
+ (WebKit::WebFrameNetworkingContext::ensureWebsiteDataStoreSession):
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::initializeWebProcess):
+ (WebKit::WebProcess::clearCachedCredentials):
+
2018-01-26 Jan-Michael Brummer <[email protected]>
[GTK] Support using long-tap gesture to open context menu
Modified: trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp (227681 => 227682)
--- trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp 2018-01-26 17:50:32 UTC (rev 227681)
+++ trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp 2018-01-26 18:36:32 UTC (rev 227682)
@@ -45,7 +45,6 @@
#include "NetworkSocketStreamMessages.h"
#include "PingLoad.h"
#include "PreconnectTask.h"
-#include "RemoteNetworkingContext.h"
#include "SessionTracker.h"
#include "WebCoreArgumentCoders.h"
#include "WebErrors.h"
Modified: trunk/Source/WebKit/NetworkProcess/NetworkLoad.h (227681 => 227682)
--- trunk/Source/WebKit/NetworkProcess/NetworkLoad.h 2018-01-26 17:50:32 UTC (rev 227681)
+++ trunk/Source/WebKit/NetworkProcess/NetworkLoad.h 2018-01-26 18:36:32 UTC (rev 227682)
@@ -29,7 +29,6 @@
#include "NetworkDataTask.h"
#include "NetworkLoadClient.h"
#include "NetworkLoadParameters.h"
-#include "RemoteNetworkingContext.h"
#include <WebCore/AuthenticationChallenge.h>
#include <wtf/CompletionHandler.h>
#include <wtf/Optional.h>
Modified: trunk/Source/WebKit/NetworkProcess/RemoteNetworkingContext.h (227681 => 227682)
--- trunk/Source/WebKit/NetworkProcess/RemoteNetworkingContext.h 2018-01-26 17:50:32 UTC (rev 227681)
+++ trunk/Source/WebKit/NetworkProcess/RemoteNetworkingContext.h 2018-01-26 18:36:32 UTC (rev 227682)
@@ -24,8 +24,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef RemoteNetworkingContext_h
-#define RemoteNetworkingContext_h
+#pragma once
#include <WebCore/NetworkingContext.h>
#include <pal/SessionID.h>
@@ -34,45 +33,10 @@
struct WebsiteDataStoreParameters;
-class RemoteNetworkingContext final : public WebCore::NetworkingContext {
+class RemoteNetworkingContext {
public:
- static Ref<RemoteNetworkingContext> create(PAL::SessionID sessionID, bool shouldClearReferrerOnHTTPSToHTTPRedirect)
- {
- return adoptRef(*new RemoteNetworkingContext(sessionID, shouldClearReferrerOnHTTPSToHTTPRedirect));
- }
- virtual ~RemoteNetworkingContext();
-
// FIXME: Remove platform-specific code and use SessionTracker.
static void ensureWebsiteDataStoreSession(WebsiteDataStoreParameters&&);
-
- bool shouldClearReferrerOnHTTPSToHTTPRedirect() const override { return m_shouldClearReferrerOnHTTPSToHTTPRedirect; }
-
-private:
- RemoteNetworkingContext(PAL::SessionID sessionID, bool shouldClearReferrerOnHTTPSToHTTPRedirect)
- : m_sessionID(sessionID)
- , m_shouldClearReferrerOnHTTPSToHTTPRedirect(shouldClearReferrerOnHTTPSToHTTPRedirect)
- {
- }
-
- bool isValid() const override;
- WebCore::NetworkStorageSession& storageSession() const override;
-
-#if PLATFORM(COCOA)
- void setLocalFileContentSniffingEnabled(bool value) { m_localFileContentSniffingEnabled = value; }
- bool localFileContentSniffingEnabled() const override;
- RetainPtr<CFDataRef> sourceApplicationAuditData() const override;
- String sourceApplicationIdentifier() const override;
- WebCore::ResourceError blockedError(const WebCore::ResourceRequest&) const override;
-#endif
-
- PAL::SessionID m_sessionID;
- bool m_shouldClearReferrerOnHTTPSToHTTPRedirect;
-
-#if PLATFORM(COCOA)
- bool m_localFileContentSniffingEnabled = false;
-#endif
};
}
-
-#endif // RemoteNetworkingContext_h
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm (227681 => 227682)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2018-01-26 17:50:32 UTC (rev 227681)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2018-01-26 18:36:32 UTC (rev 227682)
@@ -30,7 +30,6 @@
#import "NetworkProcessCreationParameters.h"
#import "NetworkResourceLoader.h"
#import "NetworkSessionCocoa.h"
-#import "RemoteNetworkingContext.h"
#import "SandboxExtension.h"
#import "SessionTracker.h"
#import <WebCore/NetworkStorageSession.h>
Modified: trunk/Source/WebKit/NetworkProcess/curl/RemoteNetworkingContextCurl.cpp (227681 => 227682)
--- trunk/Source/WebKit/NetworkProcess/curl/RemoteNetworkingContextCurl.cpp 2018-01-26 17:50:32 UTC (rev 227681)
+++ trunk/Source/WebKit/NetworkProcess/curl/RemoteNetworkingContextCurl.cpp 2018-01-26 18:36:32 UTC (rev 227682)
@@ -26,35 +26,16 @@
#include "config.h"
#include "RemoteNetworkingContext.h"
-#include "NetworkSession.h"
-#include "SessionTracker.h"
#include "WebsiteDataStoreParameters.h"
-#include <WebCore/NetworkStorageSession.h>
#include <WebCore/NotImplemented.h>
-#include <WebCore/ResourceError.h>
-#include <WebCore/ResourceHandle.h>
using namespace WebCore;
namespace WebKit {
-RemoteNetworkingContext::~RemoteNetworkingContext()
-{
-}
-
-bool RemoteNetworkingContext::isValid() const
-{
- return true;
-}
-
void RemoteNetworkingContext::ensureWebsiteDataStoreSession(WebsiteDataStoreParameters&&)
{
notImplemented();
}
-NetworkStorageSession& RemoteNetworkingContext::storageSession() const
-{
- return NetworkStorageSession::defaultStorageSession();
}
-
-}
Modified: trunk/Source/WebKit/NetworkProcess/mac/RemoteNetworkingContext.mm (227681 => 227682)
--- trunk/Source/WebKit/NetworkProcess/mac/RemoteNetworkingContext.mm 2018-01-26 17:50:32 UTC (rev 227681)
+++ trunk/Source/WebKit/NetworkProcess/mac/RemoteNetworkingContext.mm 2018-01-26 18:36:32 UTC (rev 227682)
@@ -42,45 +42,6 @@
namespace WebKit {
-
-RemoteNetworkingContext::~RemoteNetworkingContext()
-{
-}
-
-bool RemoteNetworkingContext::isValid() const
-{
- return true;
-}
-
-bool RemoteNetworkingContext::localFileContentSniffingEnabled() const
-{
- return m_localFileContentSniffingEnabled;
-}
-
-NetworkStorageSession& RemoteNetworkingContext::storageSession() const
-{
- if (auto session = NetworkStorageSession::storageSession(m_sessionID))
- return *session;
- // Some requests may still be coming shortly after NetworkProcess was told to destroy its session.
- LOG_ERROR("Invalid session ID. Please file a bug unless you just disabled private browsing, in which case it's an expected race.");
- return NetworkStorageSession::defaultStorageSession();
-}
-
-RetainPtr<CFDataRef> RemoteNetworkingContext::sourceApplicationAuditData() const
-{
- return NetworkProcess::singleton().sourceApplicationAuditData();
-}
-
-String RemoteNetworkingContext::sourceApplicationIdentifier() const
-{
- return SessionTracker::getIdentifierBase();
-}
-
-ResourceError RemoteNetworkingContext::blockedError(const ResourceRequest& request) const
-{
- return WebKit::blockedError(request);
-}
-
void RemoteNetworkingContext::ensureWebsiteDataStoreSession(WebsiteDataStoreParameters&& parameters)
{
auto sessionID = parameters.networkSessionParameters.sessionID;
Modified: trunk/Source/WebKit/NetworkProcess/soup/RemoteNetworkingContextSoup.cpp (227681 => 227682)
--- trunk/Source/WebKit/NetworkProcess/soup/RemoteNetworkingContextSoup.cpp 2018-01-26 17:50:32 UTC (rev 227681)
+++ trunk/Source/WebKit/NetworkProcess/soup/RemoteNetworkingContextSoup.cpp 2018-01-26 18:36:32 UTC (rev 227682)
@@ -32,22 +32,11 @@
#include "SessionTracker.h"
#include "WebsiteDataStoreParameters.h"
#include <WebCore/NetworkStorageSession.h>
-#include <WebCore/NotImplemented.h>
-#include <WebCore/ResourceHandle.h>
using namespace WebCore;
namespace WebKit {
-RemoteNetworkingContext::~RemoteNetworkingContext()
-{
-}
-
-bool RemoteNetworkingContext::isValid() const
-{
- return true;
-}
-
void RemoteNetworkingContext::ensureWebsiteDataStoreSession(WebsiteDataStoreParameters&& parameters)
{
auto sessionID = parameters.networkSessionParameters.sessionID;
@@ -58,11 +47,4 @@
SessionTracker::setSession(sessionID, NetworkSession::create(WTFMove(parameters.networkSessionParameters)));
}
-NetworkStorageSession& RemoteNetworkingContext::storageSession() const
-{
- if (auto session = NetworkStorageSession::storageSession(m_sessionID))
- return *session;
- return NetworkStorageSession::defaultStorageSession();
}
-
-}
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm (227681 => 227682)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm 2018-01-26 17:50:32 UTC (rev 227681)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm 2018-01-26 18:36:32 UTC (rev 227682)
@@ -66,8 +66,6 @@
uiProcessCookieStorage = cookieStorageFromIdentifyingData(parameters.uiProcessCookieStorageIdentifier);
NetworkStorageSession::ensureSession(sessionID, base + '.' + String::number(sessionID.sessionID()), WTFMove(uiProcessCookieStorage));
-
- SessionTracker::setSession(sessionID, NetworkSession::create(WTFMove(parameters.networkSessionParameters)));
}
void WebFrameNetworkingContext::setCookieAcceptPolicyForAllContexts(HTTPCookieAcceptPolicy policy)
Modified: trunk/Source/WebKit/WebProcess/WebProcess.cpp (227681 => 227682)
--- trunk/Source/WebKit/WebProcess/WebProcess.cpp 2018-01-26 17:50:32 UTC (rev 227681)
+++ trunk/Source/WebKit/WebProcess/WebProcess.cpp 2018-01-26 18:36:32 UTC (rev 227682)
@@ -273,8 +273,6 @@
platformInitializeWebProcess(WTFMove(parameters));
- SessionTracker::setSession(PAL::SessionID::defaultSessionID(), NetworkSession::create({ }));
-
// Match the QoS of the UIProcess and the scrolling thread but use a slightly lower priority.
WTF::Thread::setCurrentThreadIsUserInteractive(-1);
@@ -554,10 +552,6 @@
void WebProcess::clearCachedCredentials()
{
NetworkStorageSession::defaultStorageSession().credentialStorage().clearCredentials();
- if (auto* networkSession = SessionTracker::networkSession(PAL::SessionID::defaultSessionID()))
- networkSession->clearCredentials();
- else
- ASSERT_NOT_REACHED();
}
WebPage* WebProcess::focusedWebPage() const
