Bug 1667276 - Pre: Disable the startup cache when running a backgroun…

…d task. r=dthayer Differential Revision: https://phabricator.services.mozilla.com/D95198
dothq · Jan 27, 2021 · b57ef60 · b57ef60
1 parent 09e5216
commit b57ef60
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/startupcache/StartupCache.cpp b/startupcache/StartupCache.cpp
@@ -35,6 +35,9 @@
 #include "GeckoProfiler.h"
 #include "nsAppRunner.h"
 #include "xpcpublic.h"
+#ifdef MOZ_BACKGROUNDTASKS
+#  include "mozilla/BackgroundTasks.h"
+#endif
 
 #if defined(XP_WIN)
 #  include <windows.h>
@@ -115,6 +118,12 @@ StartupCache* StartupCache::GetSingletonNoInit() {
 }
 
 StartupCache* StartupCache::GetSingleton() {
+#ifdef MOZ_BACKGROUNDTASKS
+  if (BackgroundTasks::IsBackgroundTaskMode()) {
+    return nullptr;
+  }
+#endif
+
   if (!gStartupCache) {
     if (!XRE_IsParentProcess()) {
       return nullptr;

diff --git a/startupcache/moz.build b/startupcache/moz.build
@@ -31,4 +31,7 @@ XPIDL_SOURCES += [
     "nsIStartupCacheInfo.idl",
 ]
 
+if CONFIG["MOZ_BACKGROUNDTASKS"]:
+    DEFINES["MOZ_BACKGROUNDTASKS"] = True
+
 FINAL_LIBRARY = "xul"