From 62d535967977ea64884e4418d78f1dc245e682e1 Mon Sep 17 00:00:00 2001 From: janekptacijarabaci Date: Fri, 25 Aug 2017 09:18:29 +0200 Subject: CSP 2 - ignore (x-)frame-options if CSP with frame-ancestors directive exists --- dom/base/nsDocument.h | 1 - 1 file changed, 1 deletion(-) (limited to 'dom/base/nsDocument.h') diff --git a/dom/base/nsDocument.h b/dom/base/nsDocument.h index 17d936055..fc6749c9f 100644 --- a/dom/base/nsDocument.h +++ b/dom/base/nsDocument.h @@ -1491,7 +1491,6 @@ private: void PostUnblockOnloadEvent(); void DoUnblockOnload(); - nsresult CheckFrameOptions(); nsresult InitCSP(nsIChannel* aChannel); /** -- cgit v1.2.3 From 55d03738f9f79e30bab6294b023176d1a65ab5c3 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Wed, 13 Dec 2017 00:26:07 +0100 Subject: Don't include MediaKeySystemAccess without EME. This also removes checks for EME content in documents. This removes practical use of EME by no longer having a keying system. (no-op) tag #26 --- dom/base/nsDocument.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'dom/base/nsDocument.h') diff --git a/dom/base/nsDocument.h b/dom/base/nsDocument.h index fc6749c9f..3725b3c18 100644 --- a/dom/base/nsDocument.h +++ b/dom/base/nsDocument.h @@ -1267,7 +1267,9 @@ public: js::ExpandoAndGeneration mExpandoAndGeneration; +#ifdef MOZ_EME bool ContainsEMEContent(); +#endif bool ContainsMSEContent(); -- cgit v1.2.3