Title: [257435] releases/WebKitGTK/webkit-2.28/Source/WebKit
Revision
257435
Author
[email protected]
Date
2020-02-26 02:56:21 -0800 (Wed, 26 Feb 2020)

Log Message

Merge r256932 - Disable the process cache when process-per-tab is disabled in the debug menu
https://bugs.webkit.org/show_bug.cgi?id=207949
<rdar://problem/57094837>

Reviewed by Geoffrey Garen.

Disable the process cache when process-per-tab is disabled in the debug menu. The process cache is a
process-swap-on-navigation optimization and process-swap-on-navigation is already disabled when
process-per-tab is disabled. The process cache is not useful with such configuration and actually
leads to crashes too.

* UIProcess/WebProcessCache.cpp:
(WebKit::WebProcessCache::updateCapacity):

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog (257434 => 257435)


--- releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog	2020-02-26 10:56:17 UTC (rev 257434)
+++ releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog	2020-02-26 10:56:21 UTC (rev 257435)
@@ -1,3 +1,19 @@
+2020-02-19  Chris Dumez  <[email protected]>
+
+        Disable the process cache when process-per-tab is disabled in the debug menu
+        https://bugs.webkit.org/show_bug.cgi?id=207949
+        <rdar://problem/57094837>
+
+        Reviewed by Geoffrey Garen.
+
+        Disable the process cache when process-per-tab is disabled in the debug menu. The process cache is a
+        process-swap-on-navigation optimization and process-swap-on-navigation is already disabled when
+        process-per-tab is disabled. The process cache is not useful with such configuration and actually
+        leads to crashes too.
+
+        * UIProcess/WebProcessCache.cpp:
+        (WebKit::WebProcessCache::updateCapacity):
+
 2020-02-19  Brent Fulgham  <[email protected]>
 
         Re-disable top-level data URL navigations

Modified: releases/WebKitGTK/webkit-2.28/Source/WebKit/UIProcess/WebProcessCache.cpp (257434 => 257435)


--- releases/WebKitGTK/webkit-2.28/Source/WebKit/UIProcess/WebProcessCache.cpp	2020-02-26 10:56:17 UTC (rev 257434)
+++ releases/WebKitGTK/webkit-2.28/Source/WebKit/UIProcess/WebProcessCache.cpp	2020-02-26 10:56:21 UTC (rev 257435)
@@ -156,11 +156,13 @@
 
 void WebProcessCache::updateCapacity(WebProcessPool& processPool)
 {
-    if (!processPool.configuration().processSwapsOnNavigation() || !processPool.configuration().usesWebProcessCache() || LegacyGlobalSettings::singleton().cacheModel() != CacheModel::PrimaryWebBrowser) {
+    if (!processPool.configuration().processSwapsOnNavigation() || !processPool.configuration().usesWebProcessCache() || LegacyGlobalSettings::singleton().cacheModel() != CacheModel::PrimaryWebBrowser || processPool.configuration().usesSingleWebProcess()) {
         if (!processPool.configuration().processSwapsOnNavigation())
             WEBPROCESSCACHE_RELEASE_LOG("updateCapacity: Cache is disabled because process swap on navigation is disabled", 0);
         else if (!processPool.configuration().usesWebProcessCache())
             WEBPROCESSCACHE_RELEASE_LOG("updateCapacity: Cache is disabled by client", 0);
+        else if (processPool.configuration().usesSingleWebProcess())
+            WEBPROCESSCACHE_RELEASE_LOG("updateCapacity: Cache is disabled because process-per-tab was disabled", 0);
         else
             WEBPROCESSCACHE_RELEASE_LOG("updateCapacity: Cache is disabled because cache model is not PrimaryWebBrowser", 0);
         m_capacity = 0;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to