From f2d5afd779fd1c17b04ee40981a6aa047a4e7e92 Mon Sep 17 00:00:00 2001
From: Dan Glastonbury <dan.glastonbury@gmail.com>
Date: Mon, 27 Apr 2020 05:38:22 +0000
Subject: [PATCH] Bug 1623565 - P4: Make browser.cache.check_doc_frequency a
 StaticPref. r=nika

Due to the refactored code,
browser/base/content/test/performance/browser_preferences_usage.js started
reporting more accesses to browser.cache.check_doc_frequency preference.

Differential Revision: https://phabricator.services.mozilla.com/D68319
---
 docshell/base/nsDocShellLoadState.cpp    |  2 +-
 modules/libpref/init/StaticPrefList.yaml | 10 ++++++++++
 modules/libpref/init/all.js              |  2 --
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/docshell/base/nsDocShellLoadState.cpp b/docshell/base/nsDocShellLoadState.cpp
index 34ab9539d912..2cda2cfe9307 100644
--- a/docshell/base/nsDocShellLoadState.cpp
+++ b/docshell/base/nsDocShellLoadState.cpp
@@ -813,7 +813,7 @@ nsLoadFlags nsDocShellLoadState::CalculateChannelLoadFlags(
     case LOAD_NORMAL:
     case LOAD_LINK:
       // Set cache checking flags
-      switch (Preferences::GetInt("browser.cache.check_doc_frequency", -1)) {
+      switch (StaticPrefs::browser_cache_check_doc_frequency()) {
         case 0:
           loadFlags |= nsIRequest::VALIDATE_ONCE_PER_SESSION;
           break;
diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
index a0190c08a7dc..8617c51a8062 100644
--- a/modules/libpref/init/StaticPrefList.yaml
+++ b/modules/libpref/init/StaticPrefList.yaml
@@ -787,6 +787,16 @@
   value: 50
   mirror: always
 
+# How often to validate document in cache
+#   0 = once-per-session,
+#   1 = each-time,
+#   2 = never,
+#   3 = when-appropriate/automatically
+- name: browser.cache.check_doc_frequency
+  type: RelaxedAtomicUint32
+  value: 3
+  mirror: always
+
 - name: browser.contentblocking.database.enabled
   type: bool
   value: false
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 8512155c1f2a..99d0c00df1c7 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -233,8 +233,6 @@ pref("browser.bookmarks.max_backups",       5);
 pref("browser.cache.disk.capacity",         256000);
 
 pref("browser.cache.disk_cache_ssl",        true);
-// 0 = once-per-session, 1 = each-time, 2 = never, 3 = when-appropriate/automatically
-pref("browser.cache.check_doc_frequency",   3);
 // The half life used to re-compute cache entries frecency in hours.
 pref("browser.cache.frecency_half_life_hours", 6);