Bug 1569004 - Remove dom.min_tracking_timeout_value and dom.min_tracking_background_timeout_value varcache prefs. r=njn
authorkriswright <kwright@mozilla.com>
Fri, 26 Jul 2019 03:07:41 +0000
changeset 485173 9f8ada36cf9bd03deb4b0e5896721371ff688d63
parent 485172 a5d0fdf989304bbb9fdad74b0f8ac15baad8ff3f
child 485174 5986fb6ed82ffba333cd2ef5095b78e283cc86e7
push id91160
push userkwright@mozilla.com
push dateMon, 29 Jul 2019 17:51:51 +0000
treeherderautoland@0a9a0b8b35fa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnjn
bugs1569004
milestone70.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1569004 - Remove dom.min_tracking_timeout_value and dom.min_tracking_background_timeout_value varcache prefs. r=njn Removes dom.min_tracking_timeout_value and dom.min_tracking_background_timeout_value, because they are never used. Differential Revision: https://phabricator.services.mozilla.com/D39429
dom/base/TimeoutManager.cpp
modules/libpref/init/all.js
--- a/dom/base/TimeoutManager.cpp
+++ b/dom/base/TimeoutManager.cpp
@@ -29,21 +29,16 @@
 
 using namespace mozilla;
 using namespace mozilla::dom;
 
 LazyLogModule gTimeoutLog("Timeout");
 
 static int32_t gRunningTimeoutDepth = 0;
 
-// The default shortest interval/timeout we permit
-#define DEFAULT_MIN_TRACKING_TIMEOUT_VALUE 4                // 4ms
-#define DEFAULT_MIN_TRACKING_BACKGROUND_TIMEOUT_VALUE 1000  // 1000ms
-static int32_t gMinTrackingTimeoutValue = 0;
-static int32_t gMinTrackingBackgroundTimeoutValue = 0;
 static int32_t gTimeoutThrottlingDelay = 0;
 
 #define DEFAULT_BACKGROUND_BUDGET_REGENERATION_FACTOR 100  // 1ms per 100ms
 #define DEFAULT_FOREGROUND_BUDGET_REGENERATION_FACTOR 1    // 1ms per 1ms
 #define DEFAULT_BACKGROUND_THROTTLING_MAX_BUDGET 50        // 50ms
 #define DEFAULT_FOREGROUND_THROTTLING_MAX_BUDGET -1        // infinite
 #define DEFAULT_BUDGET_THROTTLING_MAX_DELAY 15000          // 15s
 #define DEFAULT_ENABLE_BUDGET_TIMEOUT_THROTTLING false
@@ -473,22 +468,16 @@ TimeoutManager::~TimeoutManager() {
   mIdleExecutor->Shutdown();
 
   MOZ_LOG(gTimeoutLog, LogLevel::Debug,
           ("TimeoutManager %p destroyed\n", this));
 }
 
 /* static */
 void TimeoutManager::Initialize() {
-  Preferences::AddIntVarCache(&gMinTrackingTimeoutValue,
-                              "dom.min_tracking_timeout_value",
-                              DEFAULT_MIN_TRACKING_TIMEOUT_VALUE);
-  Preferences::AddIntVarCache(&gMinTrackingBackgroundTimeoutValue,
-                              "dom.min_tracking_background_timeout_value",
-                              DEFAULT_MIN_TRACKING_BACKGROUND_TIMEOUT_VALUE);
   Preferences::AddIntVarCache(&gTimeoutThrottlingDelay,
                               "dom.timeout.throttling_delay",
                               DEFAULT_TIMEOUT_THROTTLING_DELAY);
 
   Preferences::AddUintVarCache(&gMaxConsecutiveCallbacksMilliseconds,
                                "dom.timeout.max_consecutive_callbacks_ms",
                                DEFAULT_MAX_CONSECUTIVE_CALLBACKS_MILLISECONDS);
 
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -1079,22 +1079,16 @@ pref("dom.storage.default_quota",      5
 pref("dom.storage.shadow_writes", true);
 pref("dom.storage.snapshot_prefill", 16384);
 pref("dom.storage.snapshot_gradual_prefill", 4096);
 pref("dom.storage.snapshot_reusing", true);
 pref("dom.storage.client_validation", true);
 
 pref("dom.send_after_paint_to_content", false);
 
-// Timeout clamp in ms for tracking timeouts we clamp
-// Note that this requires the privacy.trackingprotection.annotate_channels pref to be on in order to have any effect.
-pref("dom.min_tracking_timeout_value", 4);
-// And for background windows
-// Note that this requires the privacy.trackingprotection.annotate_channels pref to be on in order to have any effect.
-pref("dom.min_tracking_background_timeout_value", 4);
 // Delay in ms from document load until we start throttling background timeouts.
 pref("dom.timeout.throttling_delay", 30000);
 
 // Time (in ms) that it takes to regenerate 1ms.
 pref("dom.timeout.background_budget_regeneration_rate", 100);
 // Maximum value (in ms) for the background budget. Only valid for
 // values greater than 0.
 pref("dom.timeout.background_throttling_max_budget", 50);