Changeset 213746 in webkit

Timestamp:

Mar 10, 2017, 6:12:54 PM (8 years ago)

Author:

achristensen@apple.com

Message:

Don't compile RemoteNetworkingContext when using NetworkSession
​https://bugs.webkit.org/show_bug.cgi?id=169497

Reviewed by Andy Estes.

RemoteNetworkingContext is only really used because PingHandle requires a NetworkingContext.
When using NetworkSession, we use PingLoad instead of PingHandle, so there's no reason to
ensure there's a RemoteNetworkingContext corresponding to new private sessions when they're never used.

• NetworkProcess/NetworkProcess.cpp:

(WebKit::NetworkProcess::initializeNetworkProcess):
(WebKit::NetworkProcess::ensurePrivateBrowsingSession):

• NetworkProcess/RemoteNetworkingContext.h:
• NetworkProcess/mac/RemoteNetworkingContext.mm:

(WebKit::RemoteNetworkingContext::ensurePrivateBrowsingSession):

• NetworkProcess/soup/RemoteNetworkingContextSoup.cpp: Removed.
• PlatformGTK.cmake:

GTK only uses NetworkSession, so RemoteNetworkingContextSoup is no longer necessary.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkProcess.cpp (modified) (2 diffs)
• NetworkProcess/RemoteNetworkingContext.h (modified) (2 diffs)
• NetworkProcess/mac/RemoteNetworkingContext.mm (modified) (2 diffs)
• NetworkProcess/soup/RemoteNetworkingContextSoup.cpp (deleted)
• PlatformGTK.cmake (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-03-10  Alex Christensen  <achristensen@webkit.org>
+
+        Don't compile RemoteNetworkingContext when using NetworkSession
+        https://bugs.webkit.org/show_bug.cgi?id=169497
+
+        Reviewed by Andy Estes.
+
+        RemoteNetworkingContext is only really used because PingHandle requires a NetworkingContext.
+        When using NetworkSession, we use PingLoad instead of PingHandle, so there's no reason to 
+        ensure there's a RemoteNetworkingContext corresponding to new private sessions when they're never used.
+
+        * NetworkProcess/NetworkProcess.cpp:
+        (WebKit::NetworkProcess::initializeNetworkProcess):
+        (WebKit::NetworkProcess::ensurePrivateBrowsingSession):
+        * NetworkProcess/RemoteNetworkingContext.h:
+        * NetworkProcess/mac/RemoteNetworkingContext.mm:
+        (WebKit::RemoteNetworkingContext::ensurePrivateBrowsingSession):
+        * NetworkProcess/soup/RemoteNetworkingContextSoup.cpp: Removed.
+        * PlatformGTK.cmake:
+        GTK only uses NetworkSession, so RemoteNetworkingContextSoup is no longer necessary.
+
 2017-03-10  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp

@@ -233 +233 @@
     setCanHandleHTTPSServerTrustEvaluation(parameters.canHandleHTTPSServerTrustEvaluation);
 
+#if !USE(NETWORK_SESSION)
     // FIXME: instead of handling this here, a message should be sent later (scales to multiple sessions)
     if (parameters.privateBrowsingEnabled)
         RemoteNetworkingContext::ensurePrivateBrowsingSession(SessionID::legacyPrivateSessionID());
+#endif
 
     if (parameters.shouldUseTestingNetworkSession)
@@ -288 +290 @@
 void NetworkProcess::ensurePrivateBrowsingSession(SessionID sessionID)
 {
+#if !USE(NETWORK_SESSION)
     RemoteNetworkingContext::ensurePrivateBrowsingSession(sessionID);
+#endif
 }
 

trunk/Source/WebKit2/NetworkProcess/RemoteNetworkingContext.h

@@ -25 +25 @@
  */
 
-#ifndef RemoteNetworkingContext_h
-#define RemoteNetworkingContext_h
+#pragma once
 
 #include <WebCore/NetworkingContext.h>
 #include <WebCore/SessionID.h>
+
+#if !USE(NETWORK_SESSION)
 
 namespace WebKit {
@@ -74 +75 @@
 }
 
-#endif // RemoteNetworkingContext_h
+#endif

trunk/Source/WebKit2/NetworkProcess/mac/RemoteNetworkingContext.mm

@@ -37 +37 @@
 #import <wtf/MainThread.h>
 
+#if !USE(NETWORK_SESSION)
+
 using namespace WebCore;
 
 namespace WebKit {
-
 
 RemoteNetworkingContext::~RemoteNetworkingContext()
@@ -94 +95 @@
 
     NetworkStorageSession::ensurePrivateBrowsingSession(sessionID, base + '.' + String::number(sessionID.sessionID()));
-
-#if USE(NETWORK_SESSION)
-    auto networkSession = NetworkSession::create(sessionID, NetworkProcess::singleton().supplement<LegacyCustomProtocolManager>());
-    SessionTracker::setSession(sessionID, WTFMove(networkSession));
-#endif
 }
 
 }
+
+#endif

trunk/Source/WebKit2/PlatformGTK.cmake

@@ -41 +41 @@
     NetworkProcess/soup/NetworkProcessSoup.cpp
     NetworkProcess/soup/NetworkSessionSoup.cpp
-    NetworkProcess/soup/RemoteNetworkingContextSoup.cpp
 
     Platform/IPC/glib/GSocketMonitor.cpp