Add a flag for the WebXr Gamepad Module

There are some potential breaking changes for the WebXr gamepad module
that may make it so that it cannot be shipped at the same time with the
main WebXr Device API.  Adding this flag enables the flexibility to ship
the WebXr Device API without the optional Gamepad module if breaking
changes are needed to the gamepad module.

Bug: 1013415
Change-Id: I2c79a2a9991a6497197357ecc9f38719b0379a1f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1854863
Commit-Queue: Alexander Cooper <alcooper@chromium.org>
Reviewed-by: Brian Sheedy <bsheedy@chromium.org>
Reviewed-by: Alex Moshchuk <alexmos@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#705214}

chrome/android/javatests/src/org/chromium/chrome/browser/vr/WebXrVrInputTest.java

@@ -125,7 +125,7 @@ public class WebXrVrInputTest {
             @Restriction(RESTRICTION_TYPE_SVR)
             @CommandLineFlags
             .Remove({"enable-webvr"})
-            @CommandLineFlags.Add({"enable-features=WebXR"})
+            @CommandLineFlags.Add({"enable-features=WebXR,WebXrGamepadModule"})
             @XrActivityRestriction({XrActivityRestriction.SupportedActivity.ALL})
             public void
             testScreenTapsNotRegistered_WebXr() throws InterruptedException {
@@ -210,7 +210,7 @@ public class WebXrVrInputTest {
     @Restriction(RESTRICTION_TYPE_VIEWER_DAYDREAM_OR_STANDALONE)
     @CommandLineFlags
             .Remove({"enable-webvr"})
-            @CommandLineFlags.Add({"enable-features=WebXR"})
+            @CommandLineFlags.Add({"enable-features=WebXR,WebXrGamepadModule"})
             @XrActivityRestriction({XrActivityRestriction.SupportedActivity.ALL})
             public void testControllerClicksRegisteredOnDaydream_WebXr() {
         EmulatedVrController controller = new EmulatedVrController(mTestRule.getActivity());
@@ -246,7 +246,7 @@ public class WebXrVrInputTest {
     @Restriction(RESTRICTION_TYPE_VIEWER_DAYDREAM_OR_STANDALONE)
     @CommandLineFlags
             .Remove({"enable-webvr"})
-            @CommandLineFlags.Add({"enable-features=WebXR"})
+            @CommandLineFlags.Add({"enable-features=WebXR,WebXrGamepadModule"})
             @XrActivityRestriction({XrActivityRestriction.SupportedActivity.ALL})
             public void testControllerExposedAsGamepadOnDaydream_WebXr() {
         EmulatedVrController controller = new EmulatedVrController(mTestRule.getActivity());
@@ -397,7 +397,7 @@ public class WebXrVrInputTest {
     @Restriction(RESTRICTION_TYPE_VIEWER_NON_DAYDREAM)
     @CommandLineFlags
             .Remove({"enable-webvr"})
-            @CommandLineFlags.Add({"enable-features=WebXR"})
+            @CommandLineFlags.Add({"enable-features=WebXR,WebXrGamepadModule"})
             @XrActivityRestriction({XrActivityRestriction.SupportedActivity.ALL})
             public void testScreenTapsRegisteredOnCardboard_WebXr() {
         mWebXrVrTestFramework.loadUrlAndAwaitInitialization(
@@ -435,7 +435,7 @@ public class WebXrVrInputTest {
     @Restriction(RESTRICTION_TYPE_VIEWER_NON_DAYDREAM)
     @CommandLineFlags
             .Remove({"enable-webvr"})
-            @CommandLineFlags.Add({"enable-features=WebXR"})
+            @CommandLineFlags.Add({"enable-features=WebXR,WebXrGamepadModule"})
             @XrActivityRestriction({XrActivityRestriction.SupportedActivity.ALL})
             public void testTransientScreenTapsRegisteredOnCardboard_WebXr() {
         mWebXrVrTestFramework.loadUrlAndAwaitInitialization(
@@ -482,7 +482,7 @@ public class WebXrVrInputTest {
     @MediumTest
     @CommandLineFlags
             .Remove({"enable-webvr"})
-            @CommandLineFlags.Add({"enable-features=WebXR"})
+            @CommandLineFlags.Add({"enable-features=WebXR,WebXrGamepadModule"})
             @XrActivityRestriction({XrActivityRestriction.SupportedActivity.ALL})
             public void testPresentationLocksFocus_WebXr() {
         presentationLocksFocusImpl(WebXrVrTestFramework.getFileUrlForHtmlTestFile(
@@ -519,7 +519,7 @@ public class WebXrVrInputTest {
     @Restriction(RESTRICTION_TYPE_VIEWER_DAYDREAM_OR_STANDALONE)
     @CommandLineFlags
             .Remove({"enable-webvr"})
-            @CommandLineFlags.Add({"enable-features=WebXR"})
+            @CommandLineFlags.Add({"enable-features=WebXR,WebXrGamepadModule"})
             public void testAppButtonExitsPresentation_WebXr() {
         appButtonExitsPresentationImpl(
                 WebXrVrTestFramework.getFileUrlForHtmlTestFile("generic_webxr_page"),
@@ -572,7 +572,7 @@ public class WebXrVrInputTest {
     @XrActivityRestriction({XrActivityRestriction.SupportedActivity.ALL})
     @CommandLineFlags
             .Remove({"enable-webvr"})
-            @CommandLineFlags.Add({"enable-features=WebXR"})
+            @CommandLineFlags.Add({"enable-features=WebXR,WebXrGamepadModule"})
             public void testAppButtonNoopsWhenBrowsingDisabled_WebXr() throws ExecutionException {
         appButtonNoopsTestImpl(WebXrVrTestFramework.getFileUrlForHtmlTestFile("generic_webxr_page"),
                 mWebXrVrTestFramework);
@@ -589,7 +589,7 @@ public class WebXrVrInputTest {
             XrActivityRestriction.SupportedActivity.CCT})
     @CommandLineFlags
             .Remove({"enable-webvr"})
-            @CommandLineFlags.Add({"enable-features=WebXR"})
+            @CommandLineFlags.Add({"enable-features=WebXR,WebXrGamepadModule"})
             public void
             testAppButtonNoopsWhenBrowsingNotSupported_WebXr() throws ExecutionException {
         appButtonNoopsTestImpl(WebXrVrTestFramework.getFileUrlForHtmlTestFile("generic_webxr_page"),
@@ -671,7 +671,7 @@ public class WebXrVrInputTest {
     @Restriction(RESTRICTION_TYPE_VIEWER_DAYDREAM_OR_STANDALONE)
     @CommandLineFlags
             .Remove({"enable-webvr"})
-            @CommandLineFlags.Add({"enable-features=WebXR"})
+            @CommandLineFlags.Add({"enable-features=WebXR,WebXrGamepadModule"})
             public void testAppButtonAfterPageStopsSubmitting_WebXr() {
         appButtonAfterPageStopsSubmittingImpl(
                 WebXrVrTestFramework.getFileUrlForHtmlTestFile("webxr_page_submits_once"),
@@ -698,7 +698,7 @@ public class WebXrVrInputTest {
     @Restriction(RESTRICTION_TYPE_VIEWER_DAYDREAM_OR_STANDALONE)
     @CommandLineFlags
             .Remove({"enable-webvr"})
-            @CommandLineFlags.Add({"enable-features=WebXR"})
+            @CommandLineFlags.Add({"enable-features=WebXR,WebXrGamepadModule"})
             @XrActivityRestriction({XrActivityRestriction.SupportedActivity.ALL})
             public void testWebXrInputSourceHasGamepad() {
         webxrGamepadSupportImpl(true /* daydream */);
@@ -714,7 +714,7 @@ public class WebXrVrInputTest {
     @Restriction(RESTRICTION_TYPE_VIEWER_NON_DAYDREAM)
     @CommandLineFlags
             .Remove({"enable-webvr"})
-            @CommandLineFlags.Add({"enable-features=WebXR"})
+            @CommandLineFlags.Add({"enable-features=WebXR,WebXrGamepadModule"})
             @XrActivityRestriction({XrActivityRestriction.SupportedActivity.ALL})
             public void testWebXrInputSourceWithoutGamepad_Cardboard() {
         webxrGamepadSupportImpl(false /* daydream */);
@@ -763,7 +763,7 @@ public class WebXrVrInputTest {
     @Restriction(RESTRICTION_TYPE_VIEWER_DAYDREAM_OR_STANDALONE)
     @CommandLineFlags
             .Remove({"enable-webvr"})
-            @CommandLineFlags.Add({"enable-features=WebXR"})
+            @CommandLineFlags.Add({"enable-features=WebXR,WebXrGamepadModule"})
             @XrActivityRestriction({XrActivityRestriction.SupportedActivity.ALL})
             public void testAppButtonLongPressDisplaysPermissions() throws InterruptedException {
         testAppButtonLongPressDisplaysPermissionsImpl();
@@ -778,7 +778,7 @@ public class WebXrVrInputTest {
     @Restriction(RESTRICTION_TYPE_VIEWER_DAYDREAM_OR_STANDALONE)
     @CommandLineFlags
             .Remove({"enable-webvr"})
-            @CommandLineFlags.Add({"enable-features=WebXR"})
+            @CommandLineFlags.Add({"enable-features=WebXR,WebXrGamepadModule"})
             @XrActivityRestriction({XrActivityRestriction.SupportedActivity.CTA})
             public void testAppButtonLongPressDisplaysPermissionsIncognito()
             throws InterruptedException {
@@ -852,7 +852,7 @@ public class WebXrVrInputTest {
     @Restriction(RESTRICTION_TYPE_VIEWER_DAYDREAM_OR_STANDALONE)
     @CommandLineFlags
             .Remove({"enable-webvr"})
-            @CommandLineFlags.Add({"enable-features=WebXR"})
+            @CommandLineFlags.Add({"enable-features=WebXR,WebXrGamepadModule"})
             // TODO(https://crbug.com/901494): Make this run everywhere when permissions are
             // unbroken.
             @XrActivityRestriction({XrActivityRestriction.SupportedActivity.CTA})
@@ -865,7 +865,7 @@ public class WebXrVrInputTest {
     @Restriction(RESTRICTION_TYPE_VIEWER_DAYDREAM_OR_STANDALONE)
     @CommandLineFlags
             .Remove({"enable-webvr"})
-            @CommandLineFlags.Add({"enable-features=WebXR"})
+            @CommandLineFlags.Add({"enable-features=WebXR,WebXrGamepadModule"})
             @XrActivityRestriction({XrActivityRestriction.SupportedActivity.CTA})
             public void testInSessionPermissionRequestsIncognito() {
         mWebXrVrTestFramework.openIncognitoTab("about:blank");

chrome/browser/vr/test/webxr_vr_browser_test.cc

@@ -16,6 +16,7 @@ namespace vr {
 
 WebXrVrBrowserTestBase::WebXrVrBrowserTestBase() {
   enable_features_.push_back(features::kWebXr);
+  enable_features_.push_back(features::kWebXrGamepadModule);
 }
 
 WebXrVrBrowserTestBase::~WebXrVrBrowserTestBase() = default;

content/child/runtime_features.cc

@@ -171,6 +171,9 @@ void SetRuntimeFeaturesFromChromiumFeatures() {
   if (base::FeatureList::IsEnabled(features::kWebXrPlaneDetection))
     WebRuntimeFeatures::EnableWebXRPlaneDetection(true);
 
+  if (base::FeatureList::IsEnabled(features::kWebXrGamepadModule))
+    WebRuntimeFeatures::EnableWebXrGamepadModule(true);
+
   WebRuntimeFeatures::EnableFetchMetadata(
       base::FeatureList::IsEnabled(network::features::kFetchMetadata));
   WebRuntimeFeatures::EnableFetchMetadataDestination(

content/public/common/content_features.cc

@@ -703,6 +703,10 @@ const base::Feature kWebXrArModule{"WebXRARModule",
 const base::Feature kWebXrAnchors{"WebXRAnchors",
                                   base::FEATURE_DISABLED_BY_DEFAULT};
 
+// Enables access to the WebXR Device API gamepad module.
+const base::Feature kWebXrGamepadModule{"WebXrGamepadModule",
+                                        base::FEATURE_DISABLED_BY_DEFAULT};
+
 // Enables access to raycasting against estimated XR scene geometry.
 const base::Feature kWebXrHitTest{"WebXRHitTest",
                                   base::FEATURE_DISABLED_BY_DEFAULT};

content/public/common/content_features.h

@@ -148,6 +148,7 @@ CONTENT_EXPORT extern const base::Feature kWebXr;
 CONTENT_EXPORT extern const base::Feature kWebXrArModule;
 CONTENT_EXPORT extern const base::Feature kWebXrAnchors;
 CONTENT_EXPORT extern const base::Feature kWebXrArDOMOverlay;
+CONTENT_EXPORT extern const base::Feature kWebXrGamepadModule;
 CONTENT_EXPORT extern const base::Feature kWebXrHitTest;
 CONTENT_EXPORT extern const base::Feature kWebXrPlaneDetection;
 CONTENT_EXPORT extern const base::Feature kScriptStreamingOnPreload;

third_party/blink/public/platform/web_runtime_features.h

@@ -196,6 +196,7 @@ class WebRuntimeFeatures {
   BLINK_PLATFORM_EXPORT static void EnableWebXRARModule(bool);
   BLINK_PLATFORM_EXPORT static void EnableWebXRARDOMOverlay(bool);
   BLINK_PLATFORM_EXPORT static void EnableWebXRAnchors(bool);
+  BLINK_PLATFORM_EXPORT static void EnableWebXrGamepadModule(bool);
   BLINK_PLATFORM_EXPORT static void EnableWebXRHitTest(bool);
   BLINK_PLATFORM_EXPORT static void EnableWebXRPlaneDetection(bool);
   BLINK_PLATFORM_EXPORT static void EnableXSLT(bool);

third_party/blink/renderer/modules/xr/xr_input_source.idl

@@ -23,6 +23,6 @@ enum XRTargetRayMode {
   readonly attribute XRTargetRayMode targetRayMode;
   [SameObject] readonly attribute XRSpace targetRaySpace;
   [SameObject] readonly attribute XRSpace? gripSpace;
-  [SameObject, Measure] readonly attribute Gamepad? gamepad;
+  [SameObject, Measure, RuntimeEnabled=WebXrGamepadModule] readonly attribute Gamepad? gamepad;
   [SameObject, SaveSameObject] readonly attribute FrozenArray<DOMString> profiles;
 };

third_party/blink/renderer/platform/exported/web_runtime_features.cc

@@ -485,6 +485,10 @@ void WebRuntimeFeatures::EnableWebXRAnchors(bool enable) {
   RuntimeEnabledFeatures::SetWebXRAnchorsEnabled(enable);
 }
 
+void WebRuntimeFeatures::EnableWebXrGamepadModule(bool enable) {
+  RuntimeEnabledFeatures::SetWebXrGamepadModuleEnabled(enable);
+}
+
 void WebRuntimeFeatures::EnableWebXRHitTest(bool enable) {
   RuntimeEnabledFeatures::SetWebXRHitTestEnabled(enable);
 }

third_party/blink/renderer/platform/runtime_enabled_features.json5

@@ -1816,6 +1816,11 @@
       // depends_on: ["WebXR"],  // TODO(https://crbug.com/954679): uncomment once bug is fixed
       status: "experimental",
     },
+    {
+      name: "WebXrGamepadModule",
+      // depends_on: ["WebXR"],  // TODO(https://crbug.com/954679): uncomment once bug is fixed
+      status: "experimental",
+    },
     {
       name: "WebXRHitTest",
       // depends_on: ["WebXRARModule"],  // TODO(https://crbug.com/954679): uncomment once bug is fixed