Diff
Modified: trunk/Source/WebKit/ChangeLog (239682 => 239683)
--- trunk/Source/WebKit/ChangeLog 2019-01-07 18:04:54 UTC (rev 239682)
+++ trunk/Source/WebKit/ChangeLog 2019-01-07 18:36:22 UTC (rev 239683)
@@ -1,5 +1,33 @@
2019-01-07 Alex Christensen <[email protected]>
+ Move identifierBase from SessionTracker to NetworkProcess/WebProcess
+ https://bugs.webkit.org/show_bug.cgi?id=193201
+
+ Reviewed by Tim Horton.
+
+ No change in behavior. This just reduces process-global state.
+
+ * NetworkProcess/NetworkProcess.h:
+ (WebKit::NetworkProcess::uiProcessBundleIdentifier const):
+ * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+ (WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
+ * NetworkProcess/mac/RemoteNetworkingContext.mm:
+ (WebKit::RemoteNetworkingContext::ensureWebsiteDataStoreSession):
+ * Shared/SessionTracker.cpp:
+ (WebKit::identifierBase): Deleted.
+ (WebKit::SessionTracker::getIdentifierBase): Deleted.
+ (WebKit::SessionTracker::setIdentifierBase): Deleted.
+ * Shared/SessionTracker.h:
+ * WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm:
+ (WebKit::WebFrameNetworkingContext::ensureWebsiteDataStoreSession):
+ (WebKit::WebFrameNetworkingContext::sourceApplicationIdentifier const):
+ * WebProcess/WebProcess.h:
+ (WebKit::WebProcess::uiProcessBundleIdentifier const):
+ * WebProcess/cocoa/WebProcessCocoa.mm:
+ (WebKit::WebProcess::platformInitializeWebProcess):
+
+2019-01-07 Alex Christensen <[email protected]>
+
Reduce use of NetworkProcess::singleton
https://bugs.webkit.org/show_bug.cgi?id=193197
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.h (239682 => 239683)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2019-01-07 18:04:54 UTC (rev 239682)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2019-01-07 18:36:22 UTC (rev 239683)
@@ -209,6 +209,8 @@
NetworkHTTPSUpgradeChecker& networkHTTPSUpgradeChecker() { return m_networkHTTPSUpgradeChecker; }
#endif
+ const String& uiProcessBundleIdentifier() const { return m_uiProcessBundleIdentifier; }
+
private:
NetworkProcess();
@@ -351,6 +353,7 @@
bool m_suppressMemoryPressureHandler { false };
bool m_diskCacheIsDisabledForTesting;
bool m_canHandleHTTPSServerTrustEvaluation;
+ String m_uiProcessBundleIdentifier;
RefPtr<NetworkCache::Cache> m_cache;
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm (239682 => 239683)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2019-01-07 18:04:54 UTC (rev 239682)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2019-01-07 18:36:22 UTC (rev 239683)
@@ -86,7 +86,7 @@
_CFNetworkSetATSContext(parameters.networkATSContext.get());
- SessionTracker::setIdentifierBase(parameters.uiProcessBundleIdentifier);
+ m_uiProcessBundleIdentifier = parameters.uiProcessBundleIdentifier;
#if PLATFORM(IOS_FAMILY)
NetworkSessionCocoa::setCTDataConnectionServiceType(parameters.ctDataConnectionServiceType);
Modified: trunk/Source/WebKit/NetworkProcess/mac/RemoteNetworkingContext.mm (239682 => 239683)
--- trunk/Source/WebKit/NetworkProcess/mac/RemoteNetworkingContext.mm 2019-01-07 18:04:54 UTC (rev 239682)
+++ trunk/Source/WebKit/NetworkProcess/mac/RemoteNetworkingContext.mm 2019-01-07 18:36:22 UTC (rev 239683)
@@ -48,11 +48,9 @@
if (NetworkStorageSession::storageSession(sessionID))
return;
- String base;
- if (SessionTracker::getIdentifierBase().isNull())
+ String base = networkProcess.uiProcessBundleIdentifier();
+ if (base.isNull())
base = [[NSBundle mainBundle] bundleIdentifier];
- else
- base = SessionTracker::getIdentifierBase();
if (!sessionID.isEphemeral())
SandboxExtension::consumePermanently(parameters.cookieStoragePathExtensionHandle);
Modified: trunk/Source/WebKit/Shared/SessionTracker.cpp (239682 => 239683)
--- trunk/Source/WebKit/Shared/SessionTracker.cpp 2019-01-07 18:04:54 UTC (rev 239682)
+++ trunk/Source/WebKit/Shared/SessionTracker.cpp 2019-01-07 18:36:22 UTC (rev 239683)
@@ -34,26 +34,6 @@
namespace WebKit {
using namespace WebCore;
-static String& identifierBase()
-{
- ASSERT(RunLoop::isMain());
-
- static NeverDestroyed<String> base;
- return base;
-}
-
-const String& SessionTracker::getIdentifierBase()
-{
- return identifierBase();
-}
-
-void SessionTracker::setIdentifierBase(const String& identifier)
-{
- ASSERT(RunLoop::isMain());
-
- identifierBase() = identifier;
-}
-
static HashMap<PAL::SessionID, RefPtr<NetworkSession>>& staticSessionMap()
{
ASSERT(RunLoop::isMain());
Modified: trunk/Source/WebKit/Shared/SessionTracker.h (239682 => 239683)
--- trunk/Source/WebKit/Shared/SessionTracker.h 2019-01-07 18:04:54 UTC (rev 239682)
+++ trunk/Source/WebKit/Shared/SessionTracker.h 2019-01-07 18:36:22 UTC (rev 239683)
@@ -42,9 +42,6 @@
class SessionTracker {
WTF_MAKE_NONCOPYABLE(SessionTracker);
public:
- static const String& getIdentifierBase();
- static void setIdentifierBase(const String&);
-
static void setSession(PAL::SessionID, Ref<NetworkSession>&&);
static NetworkSession* networkSession(PAL::SessionID);
static void destroySession(PAL::SessionID);
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm (239682 => 239683)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm 2019-01-07 18:04:54 UTC (rev 239682)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm 2019-01-07 18:36:22 UTC (rev 239683)
@@ -50,11 +50,9 @@
if (NetworkStorageSession::storageSession(sessionID))
return;
- String base;
- if (SessionTracker::getIdentifierBase().isNull())
+ String base = WebProcess::singleton().uiProcessBundleIdentifier();
+ if (base.isNull())
base = [[NSBundle mainBundle] bundleIdentifier];
- else
- base = SessionTracker::getIdentifierBase();
NetworkStorageSession::ensureSession(sessionID, base + '.' + String::number(sessionID.sessionID()));
}
@@ -78,7 +76,7 @@
String WebFrameNetworkingContext::sourceApplicationIdentifier() const
{
- return SessionTracker::getIdentifierBase();
+ return WebProcess::singleton().uiProcessBundleIdentifier();
}
ResourceError WebFrameNetworkingContext::blockedError(const ResourceRequest& request) const
Modified: trunk/Source/WebKit/WebProcess/WebProcess.h (239682 => 239683)
--- trunk/Source/WebKit/WebProcess/WebProcess.h 2019-01-07 18:04:54 UTC (rev 239682)
+++ trunk/Source/WebKit/WebProcess/WebProcess.h 2019-01-07 18:36:22 UTC (rev 239683)
@@ -191,6 +191,8 @@
void destroyRenderingResources();
#endif
+ const String& uiProcessBundleIdentifier() const { return m_uiProcessBundleIdentifier; }
+
void updateActivePages();
void getActivePagesOriginsForTesting(CompletionHandler<void(Vector<String>&&)>&&);
void pageActivityStateDidChange(uint64_t pageID, OptionSet<WebCore::ActivityState::Flag> changed);
@@ -432,6 +434,7 @@
TextCheckerState m_textCheckerState;
+ String m_uiProcessBundleIdentifier;
RefPtr<NetworkProcessConnection> m_networkProcessConnection;
WebLoaderStrategy& m_webLoaderStrategy;
Modified: trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm (239682 => 239683)
--- trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm 2019-01-07 18:04:54 UTC (rev 239682)
+++ trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm 2019-01-07 18:36:22 UTC (rev 239683)
@@ -134,7 +134,7 @@
WebCore::setApplicationBundleIdentifier(parameters.uiProcessBundleIdentifier);
WebCore::setApplicationSDKVersion(parameters.uiProcessSDKVersion);
- SessionTracker::setIdentifierBase(parameters.uiProcessBundleIdentifier);
+ m_uiProcessBundleIdentifier = parameters.uiProcessBundleIdentifier;
#if ENABLE(SANDBOX_EXTENSIONS)
SandboxExtension::consumePermanently(parameters.uiProcessBundleResourcePathExtensionHandle);
