Changeset 250148 in webkit

Timestamp:

Sep 20, 2019 1:36:57 PM (5 years ago)

Author:

achristensen@apple.com

Message:

Introduce LegacyGlobalSettings for settings the NetworkProcess needs from a WebProcessPool
​https://bugs.webkit.org/show_bug.cgi?id=201970

Reviewed by Geoff Garen.

I'm starting by moving the cache model to this new abstraction.
We were using it in tests to disable the page cache, which should be done with a boolean on the pool configuration, not by changing the cache model.
We were also using it in WKContextSetCacheModel which has several clients that won't change quickly, so this abstraction is used to maintain existing behavior.
I need this so I can make a NetworkProcess not depend on anything from a WebProcessPool when starting.

• Sources.txt:
• UIProcess/API/APIProcessPoolConfiguration.cpp:

(API::ProcessPoolConfiguration::copy):

• UIProcess/API/APIProcessPoolConfiguration.h:
• UIProcess/API/C/WKContext.cpp:

(WKContextSetCacheModel):
(WKContextGetCacheModel):

• UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm:

(-[_WKProcessPoolConfiguration pageCacheEnabled]):
(-[_WKProcessPoolConfiguration setPageCacheEnabled:]):

• UIProcess/LegacyGlobalSettings.cpp: Added.

(WebKit::LegacyGlobalSettings::singleton):
(WebKit::LegacyGlobalSettings::setCacheModel):

• UIProcess/LegacyGlobalSettings.h: Added.

(WebKit::LegacyGlobalSettings::cacheModel const):

• UIProcess/WebProcessCache.cpp:

(WebKit::WebProcessCache::updateCapacity):

• UIProcess/WebProcessPool.cpp:

(WebKit::WebProcessPool::ensureNetworkProcess):
(WebKit::WebProcessPool::initializeNewWebProcess):
(WebKit::WebProcessPool::updateMaxSuspendedPageCount):
(WebKit::WebProcessPool::setCacheModel):

• UIProcess/WebProcessPool.h:
• WebKit.xcodeproj/project.pbxproj:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Sources.txt (modified) (1 diff)
• UIProcess/API/APIProcessPoolConfiguration.cpp (modified) (2 diffs)
• UIProcess/API/APIProcessPoolConfiguration.h (modified) (3 diffs)
• UIProcess/API/C/WKContext.cpp (modified) (2 diffs)
• UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm (modified) (2 diffs)
• UIProcess/API/glib/WebKitWebContext.cpp (modified) (4 diffs)
• UIProcess/LegacyGlobalSettings.cpp (added)
• UIProcess/LegacyGlobalSettings.h (added)
• UIProcess/WebProcessCache.cpp (modified) (2 diffs)
• UIProcess/WebProcessPool.cpp (modified) (4 diffs)
• UIProcess/WebProcessPool.h (modified) (1 diff)
• UIProcess/glib/WebProcessPoolGLib.cpp (modified) (2 diffs)
• WebKit.xcodeproj/project.pbxproj (modified) (3 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-09-20  Alex Christensen  <achristensen@webkit.org>
+
+        Introduce LegacyGlobalSettings for settings the NetworkProcess needs from a WebProcessPool
+        https://bugs.webkit.org/show_bug.cgi?id=201970
+
+        Reviewed by Geoff Garen.
+
+        I'm starting by moving the cache model to this new abstraction.
+        We were using it in tests to disable the page cache, which should be done with a boolean on the pool configuration, not by changing the cache model.
+        We were also using it in WKContextSetCacheModel which has several clients that won't change quickly, so this abstraction is used to maintain existing behavior.
+        I need this so I can make a NetworkProcess not depend on anything from a WebProcessPool when starting.
+
+        * Sources.txt:
+        * UIProcess/API/APIProcessPoolConfiguration.cpp:
+        (API::ProcessPoolConfiguration::copy):
+        * UIProcess/API/APIProcessPoolConfiguration.h:
+        * UIProcess/API/C/WKContext.cpp:
+        (WKContextSetCacheModel):
+        (WKContextGetCacheModel):
+        * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm:
+        (-[_WKProcessPoolConfiguration pageCacheEnabled]):
+        (-[_WKProcessPoolConfiguration setPageCacheEnabled:]):
+        * UIProcess/LegacyGlobalSettings.cpp: Added.
+        (WebKit::LegacyGlobalSettings::singleton):
+        (WebKit::LegacyGlobalSettings::setCacheModel):
+        * UIProcess/LegacyGlobalSettings.h: Added.
+        (WebKit::LegacyGlobalSettings::cacheModel const):
+        * UIProcess/WebProcessCache.cpp:
+        (WebKit::WebProcessCache::updateCapacity):
+        * UIProcess/WebProcessPool.cpp:
+        (WebKit::WebProcessPool::ensureNetworkProcess):
+        (WebKit::WebProcessPool::initializeNewWebProcess):
+        (WebKit::WebProcessPool::updateMaxSuspendedPageCount):
+        (WebKit::WebProcessPool::setCacheModel):
+        * UIProcess/WebProcessPool.h:
+        * WebKit.xcodeproj/project.pbxproj:
+
 2019-09-20  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/Sources.txt

@@ -245 +245 @@
 UIProcess/GeolocationPermissionRequestProxy.cpp
 UIProcess/InspectorTargetProxy.cpp
+UIProcess/LegacyGlobalSettings.cpp
 UIProcess/PageLoadState.cpp
 UIProcess/ProcessAssertion.cpp

trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp

@@ -45 +45 @@
     auto copy = this->create();
 
-    copy->m_cacheModel = this->m_cacheModel;
     copy->m_diskCacheSpeculativeValidationEnabled = this->m_diskCacheSpeculativeValidationEnabled;
     copy->m_injectedBundlePath = this->m_injectedBundlePath;
@@ -73 +72 @@
     copy->m_isAutomaticProcessWarmingEnabledByClient = this->m_isAutomaticProcessWarmingEnabledByClient;
     copy->m_usesWebProcessCache = this->m_usesWebProcessCache;
+    copy->m_usesPageCache = this->m_usesPageCache;
 #if PLATFORM(COCOA)
     copy->m_suppressesConnectionTerminationOnSystemChange = this->m_suppressesConnectionTerminationOnSystemChange;

trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h

@@ -75 +75 @@
     void setDiskCacheSpeculativeValidationEnabled(bool enabled) { m_diskCacheSpeculativeValidationEnabled = enabled; }
 
-    WebKit::CacheModel cacheModel() const { return m_cacheModel; }
-    void setCacheModel(WebKit::CacheModel cacheModel) { m_cacheModel = cacheModel; }
+    void setUsesPageCache(bool value) { m_usesPageCache = value; }
+    bool usesPageCache() const { return m_usesPageCache; }
 
     const WTF::String& injectedBundlePath() const { return m_injectedBundlePath; }
@@ -159 +159 @@
 private:
     bool m_diskCacheSpeculativeValidationEnabled { false };
-    WebKit::CacheModel m_cacheModel { WebKit::CacheModel::PrimaryWebBrowser };
 
     WTF::String m_injectedBundlePath;
@@ -182 +181 @@
     Optional<bool> m_isAutomaticProcessWarmingEnabledByClient;
     bool m_usesWebProcessCache { false };
+    bool m_usesPageCache { true };
     bool m_clientWouldBenefitFromAutomaticProcessPrewarming { false };
     WTF::String m_customWebContentServiceBundleIdentifier;

trunk/Source/WebKit/UIProcess/API/C/WKContext.cpp

@@ -36 +36 @@
 #include "AuthenticationChallengeProxy.h"
 #include "DownloadProxy.h"
+#include "LegacyGlobalSettings.h"
 #include "WKAPICast.h"
 #include "WKArray.h"
@@ -321 +322 @@
 void WKContextSetCacheModel(WKContextRef contextRef, WKCacheModel cacheModel)
 {
-    WebKit::toImpl(contextRef)->setCacheModel(WebKit::toCacheModel(cacheModel));
+    LegacyGlobalSettings::singleton().setCacheModel(WebKit::toCacheModel(cacheModel));
 }
 
 WKCacheModel WKContextGetCacheModel(WKContextRef contextRef)
 {
-    return WebKit::toAPI(WebKit::toImpl(contextRef)->cacheModel());
+    return WebKit::toAPI(LegacyGlobalSettings::singleton().cacheModel());
 }
 

trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm

@@ -27 +27 @@
 #import "_WKProcessPoolConfigurationInternal.h"
 
+#import "LegacyGlobalSettings.h"
 #import <objc/runtime.h>
 #import <wtf/RetainPtr.h>
@@ -314 +315 @@
 - (BOOL)pageCacheEnabled
 {
-    return _processPoolConfiguration->cacheModel() != WebKit::CacheModel::DocumentViewer;
+    return _processPoolConfiguration->usesPageCache();
 }
 
 - (void)setPageCacheEnabled:(BOOL)enabled
 {
-    if (!enabled)
-        _processPoolConfiguration->setCacheModel(WebKit::CacheModel::DocumentViewer);
-    else if (![self pageCacheEnabled])
-        _processPoolConfiguration->setCacheModel(WebKit::CacheModel::PrimaryWebBrowser);
+    return _processPoolConfiguration->setUsesPageCache(enabled);
 }
 

trunk/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp

@@ -28 +28 @@
 #include "APIProcessPoolConfiguration.h"
 #include "APIString.h"
+#include "LegacyGlobalSettings.h"
 #include "TextChecker.h"
 #include "TextCheckerState.h"
@@ -691 +692 @@
  * %WEBKIT_CACHE_MODEL_WEB_BROWSER.
  */
-void webkit_web_context_set_cache_model(WebKitWebContext* context, WebKitCacheModel model)
+void webkit_web_context_set_cache_model(WebKitWebContext*, WebKitCacheModel model)
 {
     CacheModel cacheModel;
-
-    g_return_if_fail(WEBKIT_IS_WEB_CONTEXT(context));
 
     switch (model) {
@@ -711 +710 @@
     }
 
-    if (cacheModel != context->priv->processPool->cacheModel())
-        context->priv->processPool->setCacheModel(cacheModel);
+    if (cacheModel != LegacyGlobalSettings::singleton().cacheModel())
+        LegacyGlobalSettings::singleton().setCacheModel(cacheModel);
 }
 
@@ -729 +728 @@
     g_return_val_if_fail(WEBKIT_IS_WEB_CONTEXT(context), WEBKIT_CACHE_MODEL_WEB_BROWSER);
 
-    switch (context->priv->processPool->cacheModel()) {
+    switch (LegacyGlobalSettings::singleton().cacheModel()) {
     case CacheModel::DocumentViewer:
         return WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER;

trunk/Source/WebKit/UIProcess/WebProcessCache.cpp

@@ -27 +27 @@
 #include "WebProcessCache.h"
 
+#include "LegacyGlobalSettings.h"
 #include "Logging.h"
 #include "WebProcessPool.h"
@@ -151 +152 @@
 void WebProcessCache::updateCapacity(WebProcessPool& processPool)
 {
-    if (!processPool.configuration().processSwapsOnNavigation() || !processPool.configuration().usesWebProcessCache() || processPool.cacheModel() != CacheModel::PrimaryWebBrowser) {
+    if (!processPool.configuration().processSwapsOnNavigation() || !processPool.configuration().usesWebProcessCache() || LegacyGlobalSettings::singleton().cacheModel() != CacheModel::PrimaryWebBrowser) {
         if (!processPool.configuration().processSwapsOnNavigation())
             RELEASE_LOG(ProcessSwapping, "%p - WebProcessCache::updateCapacity: Cache is disabled because process swap on navigation is disabled", this);

trunk/Source/WebKit/UIProcess/WebProcessPool.cpp

@@ -493 +493 @@
     }
 
-    parameters.cacheModel = cacheModel();
+    parameters.cacheModel = LegacyGlobalSettings::singleton().cacheModel();
     parameters.canHandleHTTPSServerTrustEvaluation = m_canHandleHTTPSServerTrustEvaluation;
 
@@ -920 +920 @@
 #endif
 
-    parameters.cacheModel = cacheModel();
+    parameters.cacheModel = LegacyGlobalSettings::singleton().cacheModel();
     parameters.languages = configuration().overrideLanguages().isEmpty() ? userPreferredLanguages() : configuration().overrideLanguages();
 
@@ -1576 +1576 @@
 void WebProcessPool::updateMaxSuspendedPageCount()
 {
+    if (!m_configuration->usesPageCache())
+        return;
+
     unsigned dummy = 0;
     Seconds dummyInterval;
     unsigned pageCacheSize = 0;
-    calculateMemoryCacheSizes(m_configuration->cacheModel(), dummy, dummy, dummy, dummyInterval, pageCacheSize);
+    calculateMemoryCacheSizes(LegacyGlobalSettings::singleton().cacheModel(), dummy, dummy, dummy, dummyInterval, pageCacheSize);
 
     m_maxSuspendedPageCount = pageCacheSize;
@@ -1589 +1592 @@
 void WebProcessPool::setCacheModel(CacheModel cacheModel)
 {
-    m_configuration->setCacheModel(cacheModel);
     updateMaxSuspendedPageCount();
 

trunk/Source/WebKit/UIProcess/WebProcessPool.h

@@ -282 +282 @@
 
     void setCacheModel(CacheModel);
-    CacheModel cacheModel() const { return m_configuration->cacheModel(); }
 
     void setDefaultRequestTimeoutInterval(double);

trunk/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp

@@ -29 +29 @@
 #include "WebProcessPool.h"
 
+#include "LegacyGlobalSettings.h"
 #include "WebMemoryPressureHandler.h"
 #include "WebProcessCreationParameters.h"
@@ -126 +127 @@
 #endif
 
-    parameters.memoryCacheDisabled = m_memoryCacheDisabled || cacheModel() == CacheModel::DocumentViewer;
+    parameters.memoryCacheDisabled = m_memoryCacheDisabled || LegacyGlobalSettings::singleton().cacheModel() == CacheModel::DocumentViewer;
     parameters.proxySettings = m_networkProxySettings;
 

trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

@@ -1726 +1726 @@
                         filePatterns = "*.h";
                         fileType = pattern.proxy;
+                        inputFiles = (
+                        );
                         isEditable = 1;
                         outputFiles = (
@@ -3695 +3697 @@
                 5CE9120C2293C1E0005BEC78 /* WKMain.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKMain.mm; sourceTree = "<group>"; };
                 5CE9120F2293C25F005BEC78 /* AuxiliaryProcessMain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AuxiliaryProcessMain.cpp; path = Cocoa/AuxiliaryProcessMain.cpp; sourceTree = "<group>"; };
+                5CEABA2A2333247700797797 /* LegacyGlobalSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LegacyGlobalSettings.h; sourceTree = "<group>"; };
+                5CEABA2B2333251400797797 /* LegacyGlobalSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LegacyGlobalSettings.cpp; sourceTree = "<group>"; };
                 5CFECB031E1ED1C800F88504 /* LegacyCustomProtocolManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LegacyCustomProtocolManager.cpp; sourceTree = "<group>"; };
                 5DAD73F1116FF90C00EE5396 /* BaseTarget.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = BaseTarget.xcconfig; sourceTree = "<group>"; };
@@ -7756 +7760 @@
                                 A5E391FB2183C1E900C8FB31 /* InspectorTargetProxy.cpp */,
                                 A5E391FC2183C1E900C8FB31 /* InspectorTargetProxy.h */,
+                                5CEABA2B2333251400797797 /* LegacyGlobalSettings.cpp */,
+                                5CEABA2A2333247700797797 /* LegacyGlobalSettings.h */,
                                 31607F3819627002009B87DA /* LegacySessionStateCoding.h */,
                                 BC6EDAA5111271C600E7678B /* PageClient.h */,