Enable GamepadButton's touched attribute by default
Per approval in
https://groups.google.com/a/chromium.org/d/topic/blink-dev/pc5Jx9qcEJo/discussion
Bug: 830140
Change-Id: Ib7e90aa7a5c6eb557c82c9d7389ea27f1a710286
Reviewed-on: https://chromium-review.googlesource.com/c/1003133
Commit-Queue: David Dorwin <ddorwin@chromium.org>
Reviewed-by: Daniel Bratell <bratell@opera.com>
Reviewed-by: Brandon Jones <bajones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#615260}diff --git a/third_party/blink/renderer/modules/gamepad/gamepad_button.idl b/third_party/blink/renderer/modules/gamepad/gamepad_button.idl
index a36a3b8..99fae2f2 100644
--- a/third_party/blink/renderer/modules/gamepad/gamepad_button.idl
+++ b/third_party/blink/renderer/modules/gamepad/gamepad_button.idl
@@ -4,7 +4,6 @@
interface GamepadButton {
readonly attribute boolean pressed;
- // TODO(bajones): Enable this by default as it is part of the core spec.
- [OriginTrialEnabled=WebXRGamepadSupport, MeasureAs=GamepadButtonTouched] readonly attribute boolean touched;
+ [MeasureAs=GamepadButtonTouched] readonly attribute boolean touched;
readonly attribute double value;
};
diff --git a/third_party/blink/web_tests/http/tests/origin_trials/webexposed/xr/webvr-gamepad-origin-trial-interfaces.html b/third_party/blink/web_tests/http/tests/origin_trials/webexposed/xr/webvr-gamepad-origin-trial-interfaces.html
index 80f3d41..ce951f6 100644
--- a/third_party/blink/web_tests/http/tests/origin_trials/webexposed/xr/webvr-gamepad-origin-trial-interfaces.html
+++ b/third_party/blink/web_tests/http/tests/origin_trials/webexposed/xr/webvr-gamepad-origin-trial-interfaces.html
@@ -14,7 +14,6 @@
properties_to_check = {
'Gamepad': ['pose', 'hand', 'displayId'],
- 'GamepadButton': ['touched'],
};
interfaces_to_check = [
diff --git a/third_party/blink/web_tests/http/tests/origin_trials/webexposed/xr/webxr-gamepad-origin-trial-interfaces.html b/third_party/blink/web_tests/http/tests/origin_trials/webexposed/xr/webxr-gamepad-origin-trial-interfaces.html
index 4026582e..c8bf24c 100644
--- a/third_party/blink/web_tests/http/tests/origin_trials/webexposed/xr/webxr-gamepad-origin-trial-interfaces.html
+++ b/third_party/blink/web_tests/http/tests/origin_trials/webexposed/xr/webxr-gamepad-origin-trial-interfaces.html
@@ -14,7 +14,6 @@
const token="AmQCIm7DYplQu/Vuep/62Rwyu+gYKwA1kz4CkNQWwtUnkr4o+kHqiSBZYD6APsbzyDDKm5xKi4BH4MxnheS8qwIAAABbeyJvcmlnaW4iOiAiaHR0cDovLzEyNy4wLjAuMTo4MDAwIiwgImZlYXR1cmUiOiAiV2ViWFJHYW1lcGFkU3VwcG9ydCIsICJleHBpcnkiOiAyMDAwMDAwMDAwfQ==";
const properties_to_check = {
'Gamepad': ['hand', 'displayId'],
- 'GamepadButton': ['touched'],
}
// Skip this test if flags are not set properly.
diff --git a/third_party/blink/web_tests/virtual/stable/webexposed/global-interface-listing-expected.txt b/third_party/blink/web_tests/virtual/stable/webexposed/global-interface-listing-expected.txt
index a0f8026c..5eba8fac 100644
--- a/third_party/blink/web_tests/virtual/stable/webexposed/global-interface-listing-expected.txt
+++ b/third_party/blink/web_tests/virtual/stable/webexposed/global-interface-listing-expected.txt
@@ -1776,6 +1776,7 @@
interface GamepadButton
attribute @@toStringTag
getter pressed
+ getter touched
getter value
method constructor
interface GamepadEvent : Event
