From dc12741beed0d50ddfeb05daf3ffae7db74ffab8 Mon Sep 17 00:00:00 2001 From: Cameron Kaiser Date: Fri, 27 Jul 2018 11:50:57 -0700 Subject: [PATCH] #516: idle time to 10s; add more adblock hosts --- caps/nsScriptSecurityManager.cpp | 3 +++ dom/base/nsGlobalWindow.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/caps/nsScriptSecurityManager.cpp b/caps/nsScriptSecurityManager.cpp index 7ab624b52..d2edb50c9 100644 --- a/caps/nsScriptSecurityManager.cpp +++ b/caps/nsScriptSecurityManager.cpp @@ -1125,6 +1125,9 @@ nsScriptSecurityManager::CheckLoadURIWithPrincipal(nsIPrincipal* aPrincipal, BLOK("secure-cdn.mplxtms.com") || BLOK("usadmm.dotomi.com") || + + BLOK("p.d.1emn.com") || + BLOK("p.w.1emn.com") || 0) { #undef BLOK // Yup. diff --git a/dom/base/nsGlobalWindow.h b/dom/base/nsGlobalWindow.h index 14c0b7dbe..b10b0a0c3 100644 --- a/dom/base/nsGlobalWindow.h +++ b/dom/base/nsGlobalWindow.h @@ -70,7 +70,7 @@ #define MAX_IDLE_FUZZ_TIME_MS 90000 // Min idle notification time in seconds. -#define MIN_IDLE_NOTIFICATION_TIME_S 1 +#define MIN_IDLE_NOTIFICATION_TIME_S 10 class nsIArray; class nsIBaseWindow;