summaryrefslogtreecommitdiffstats
path: root/layout/build/nsLayoutStatics.cpp
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2020-06-01 21:58:35 +0000
committerMoonchild <moonchild@palemoon.org>2020-06-01 21:58:35 +0000
commitc6ca4380e9e5e95df9de02daf8bfb9a6ebc22810 (patch)
treec7672903a2030d37f861b12900165a015f49d10a /layout/build/nsLayoutStatics.cpp
parent451509e2c0188a4164d4b3d1d9f5839ed1e95246 (diff)
parent744b044935f7d1d67fbe0df42d898efcbdd00536 (diff)
downloadUXP-c6ca4380e9e5e95df9de02daf8bfb9a6ebc22810.tar
UXP-c6ca4380e9e5e95df9de02daf8bfb9a6ebc22810.tar.gz
UXP-c6ca4380e9e5e95df9de02daf8bfb9a6ebc22810.tar.lz
UXP-c6ca4380e9e5e95df9de02daf8bfb9a6ebc22810.tar.xz
UXP-c6ca4380e9e5e95df9de02daf8bfb9a6ebc22810.zip
Merge remote-tracking branch 'origin/redwood' into release
Diffstat (limited to 'layout/build/nsLayoutStatics.cpp')
-rw-r--r--layout/build/nsLayoutStatics.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/layout/build/nsLayoutStatics.cpp b/layout/build/nsLayoutStatics.cpp
index 124bcbf10..d71513268 100644
--- a/layout/build/nsLayoutStatics.cpp
+++ b/layout/build/nsLayoutStatics.cpp
@@ -273,7 +273,9 @@ nsLayoutStatics::Initialize()
ProcessPriorityManager::Init();
+#ifdef MOZ_PERMISSIONS
nsPermissionManager::ClearOriginDataObserverInit();
+#endif
nsCookieService::AppClearDataObserverInit();
nsApplicationCacheService::AppClearDataObserverInit();