Bug 1495358 - FeaturePolicy: vr, r=kip

dom/base/Navigator.cpp

@@ -1274,11 +1274,17 @@ Navigator::RequestGamepadServiceTest()
 already_AddRefed<Promise>
 Navigator::GetVRDisplays(ErrorResult& aRv)
 {
-  if (!mWindow || !mWindow->GetDocShell()) {
+  if (!mWindow || !mWindow->GetDocShell() || !mWindow->GetExtantDoc()) {
     aRv.Throw(NS_ERROR_UNEXPECTED);
     return nullptr;
   }
 
+  if (!FeaturePolicyUtils::IsFeatureAllowed(mWindow->GetExtantDoc(),
+                                            NS_LITERAL_STRING("vr"))) {
+    aRv.Throw(NS_ERROR_DOM_SECURITY_ERR);
+    return nullptr;
+  }
+
   nsGlobalWindowInner* win = nsGlobalWindowInner::Cast(mWindow);
   win->NotifyVREventListenerAdded();
 

dom/security/featurepolicy/FeaturePolicyUtils.cpp

@@ -40,7 +40,6 @@ static FeatureMap sSupportedFeatures[] = {
   { "payment", FeatureMap::eSelf  },
   // TODO: not supported yet!!!
   { "speaker", FeatureMap::eSelf  },
-  // TODO: not supported yet!!!
   { "vr", FeatureMap::eSelf  },
 };
 

testing/web-platform/meta/webvr/__dir__.ini

@@ -1 +1 @@
-prefs: [dom.vr.enabled:true]
+prefs: [dom.vr.enabled:true,dom.security.featurePolicy.enabled:true]

testing/web-platform/meta/webvr/webvr-disabled-by-feature-policy.https.sub.html.ini

@@ -1,10 +0,0 @@
-[webvr-disabled-by-feature-policy.https.sub.html]
-  [Feature-Policy header vr "none" disallows the top-level document.]
-    expected: FAIL
-
-  [Feature-Policy header vr "none" disallows same-origin iframes.]
-    expected: FAIL
-
-  [Feature-Policy header vr "none" disallows cross-origin iframes.]
-    expected: FAIL
-

testing/web-platform/meta/webvr/webvr-enabled-by-feature-policy-attribute-redirect-on-load.https.sub.html.ini

@@ -1,7 +0,0 @@
-[webvr-enabled-by-feature-policy-attribute-redirect-on-load.https.sub.html]
-  [Feature-Policy allow="vr" attribute allows same-origin relocation]
-    expected: FAIL
-
-  [Feature-Policy allow="vr" attribute disallows cross-origin relocation]
-    expected: FAIL
-

testing/web-platform/meta/webvr/webvr-enabled-by-feature-policy-attribute.https.sub.html.ini

@@ -1,7 +1,4 @@
 [webvr-enabled-by-feature-policy-attribute.https.sub.html]
-  [Feature-Policy allow="vr" attribute allows same-origin iframe]
-    expected: FAIL
-
   [Feature-Policy allow="vr" attribute allows cross-origin iframe]
     expected: FAIL
 

testing/web-platform/meta/webvr/webvr-enabled-on-self-origin-by-feature-policy.https.sub.html.ini

@@ -1,4 +0,0 @@
-[webvr-enabled-on-self-origin-by-feature-policy.https.sub.html]
-  [Feature-Policy header vr "self" disallows cross-origin iframes.]
-    expected: FAIL
-