From 6eb130211cf2dcb5bf7fd2d8a28553cc0620fcde Mon Sep 17 00:00:00 2001 From: Andrea Marchesini Date: Tue, 16 Oct 2018 07:58:00 +0200 Subject: [PATCH] Bug 1497486 - Enable FeaturePolicy in nightly, r=ckerschb --- modules/libpref/init/StaticPrefList.h | 8 +++++++- ...e-policy-attribute-redirect-on-load.https.sub.html.ini | 3 --- ...e-policy-attribute-redirect-on-load.https.sub.html.ini | 8 +++----- ...allowed-by-feature-policy-attribute.https.sub.html.ini | 5 +++-- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/modules/libpref/init/StaticPrefList.h b/modules/libpref/init/StaticPrefList.h index 972dc1fedd7f..458a79cd080f 100644 --- a/modules/libpref/init/StaticPrefList.h +++ b/modules/libpref/init/StaticPrefList.h @@ -1745,11 +1745,17 @@ VARCACHE_PREF( // Feature-Policy prefs //--------------------------------------------------------------------------- +#ifdef NIGHTLY_BUILD +# define PREF_VALUE true +#else +# define PREF_VALUE false +#endif VARCACHE_PREF( "dom.security.featurePolicy.enabled", dom_security_featurePolicy_enabled, - bool, false + bool, PREF_VALUE ) +#undef PREF_VALUE //--------------------------------------------------------------------------- // End of prefs diff --git a/testing/web-platform/meta/wake-lock/wakelock-enabled-by-feature-policy-attribute-redirect-on-load.https.sub.html.ini b/testing/web-platform/meta/wake-lock/wakelock-enabled-by-feature-policy-attribute-redirect-on-load.https.sub.html.ini index 8cfb38ba8dbc..17ce932f18e5 100644 --- a/testing/web-platform/meta/wake-lock/wakelock-enabled-by-feature-policy-attribute-redirect-on-load.https.sub.html.ini +++ b/testing/web-platform/meta/wake-lock/wakelock-enabled-by-feature-policy-attribute-redirect-on-load.https.sub.html.ini @@ -2,6 +2,3 @@ [Feature-Policy allow="wake-lock" allows same-origin relocation] expected: FAIL - [Feature-Policy allow="wake-lock" disallows cross-origin relocation] - expected: FAIL - diff --git a/testing/web-platform/meta/webusb/usb-allowed-by-feature-policy-attribute-redirect-on-load.https.sub.html.ini b/testing/web-platform/meta/webusb/usb-allowed-by-feature-policy-attribute-redirect-on-load.https.sub.html.ini index 7ddb197b51c5..f7ad77f77b5a 100644 --- a/testing/web-platform/meta/webusb/usb-allowed-by-feature-policy-attribute-redirect-on-load.https.sub.html.ini +++ b/testing/web-platform/meta/webusb/usb-allowed-by-feature-policy-attribute-redirect-on-load.https.sub.html.ini @@ -1,13 +1,11 @@ [usb-allowed-by-feature-policy-attribute-redirect-on-load.https.sub.html] + expected: TIMEOUT [Feature-Policy allow="usb" allows same-origin relocation.] expected: FAIL - [Feature-Policy allow="usb" disallows cross-origin relocation.] - expected: FAIL - [Feature-Policy allow="usb" allows workers in same-origin relocation.] - expected: FAIL + expected: TIMEOUT [Feature-Policy allow="usb" disallows workers in cross-origin relocation.] - expected: FAIL + expected: TIMEOUT diff --git a/testing/web-platform/meta/webusb/usb-allowed-by-feature-policy-attribute.https.sub.html.ini b/testing/web-platform/meta/webusb/usb-allowed-by-feature-policy-attribute.https.sub.html.ini index ce466c0f3be8..a8ee88b399d2 100644 --- a/testing/web-platform/meta/webusb/usb-allowed-by-feature-policy-attribute.https.sub.html.ini +++ b/testing/web-platform/meta/webusb/usb-allowed-by-feature-policy-attribute.https.sub.html.ini @@ -1,4 +1,5 @@ [usb-allowed-by-feature-policy-attribute.https.sub.html] + expected: TIMEOUT [Feature policy "usb" can be enabled in cross-origin iframes using "allowed" attribute.] expected: FAIL @@ -9,10 +10,10 @@ expected: FAIL [Feature policy "usb" can be enabled in a worker in same-origin iframe using allow="usb" attribute] - expected: FAIL + expected: TIMEOUT [Feature policy "usb" can be enabled in a worker in cross-origin iframe using allow="usb" attribute] - expected: FAIL + expected: TIMEOUT [Inherited header feature policy allows dedicated workers.] expected: FAIL