Skip to content

GitLab

T
tangled
Commit 4fff66e2 authored by Owen Min's avatar Owen Min Committed by Commit Bot
Browse files
Options

Revert "Changed XRHandedness enum to 'none' from empty string" 

This reverts commit c92b0f22.

Reason for revert: Causing https://ci.chromium.org/p/chromium/builders/ci/WebKit%20Linux%20Trusty%20Leak/31011

Original change's description:
> Changed XRHandedness enum to 'none' from empty string
> 
> Bug: 933411
> Change-Id: I7e698846e7c733c15a82bd9079855df1e2d5abf4
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1504223
> Reviewed-by: Brian Sheedy <bsheedy@chromium.org>
> Reviewed-by: Klaus Weidner <klausw@chromium.org>
> Commit-Queue: Brandon Jones <bajones@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#638243}

TBR=bajones@chromium.org,bsheedy@chromium.org,klausw@chromium.org

Change-Id: I09a7db9d04fb9d51a07e3600a593ec20c1d398bf
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 933411
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1506568Reviewed-by: default avatarOwen Min <zmin@chromium.org>
Commit-Queue: Owen Min <zmin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#638279}
parent 7973f37c
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 116 deletions
third_party/blink/renderer/modules/xr/xr_input_source.cc
View file @ 4fff66e2
...@@ -42,7 +42,7 @@ void XRInputSource::SetHandedness(Handedness handedness) { ...@@ -42,7 +42,7 @@ void XRInputSource::SetHandedness(Handedness handedness) {
switch (handedness_) { switch (handedness_) {
case kHandNone: case kHandNone:
handedness_string_ = "none"; handedness_string_ = "";
return; return;
case kHandLeft: case kHandLeft:
handedness_string_ = "left"; handedness_string_ = "left";
...@@ -50,9 +50,6 @@ void XRInputSource::SetHandedness(Handedness handedness) { ...@@ -50,9 +50,6 @@ void XRInputSource::SetHandedness(Handedness handedness) {
case kHandRight: case kHandRight:
handedness_string_ = "right"; handedness_string_ = "right";
return; return;
case kHandUninitialized:
NOTREACHED() << "Cannot set handedness to uninitialized";
return;
} }
NOTREACHED() << "Unknown handedness: " << handedness_; NOTREACHED() << "Unknown handedness: " << handedness_;
......
third_party/blink/renderer/modules/xr/xr_input_source.h
View file @ 4fff66e2
...@@ -19,12 +19,7 @@ class XRInputSource : public ScriptWrappable { ...@@ -19,12 +19,7 @@ class XRInputSource : public ScriptWrappable {
DEFINE_WRAPPERTYPEINFO(); DEFINE_WRAPPERTYPEINFO();
public: public:
enum Handedness { enum Handedness { kHandNone = 0, kHandLeft = 1, kHandRight = 2 };
kHandUninitialized = -1,
kHandNone = 0,
kHandLeft = 1,
kHandRight = 2
};
enum TargetRayMode { kGaze = 1, kTrackedPointer = 2, kScreen = 3 }; enum TargetRayMode { kGaze = 1, kTrackedPointer = 2, kScreen = 3 };
XRInputSource(XRSession*, uint32_t source_id); XRInputSource(XRSession*, uint32_t source_id);
...@@ -56,7 +51,7 @@ class XRInputSource : public ScriptWrappable { ...@@ -56,7 +51,7 @@ class XRInputSource : public ScriptWrappable {
const Member<XRSession> session_; const Member<XRSession> session_;
const uint32_t source_id_; const uint32_t source_id_;
Handedness handedness_ = kHandUninitialized; Handedness handedness_;
String handedness_string_; String handedness_string_;
TargetRayMode target_ray_mode_; TargetRayMode target_ray_mode_;
......
third_party/blink/renderer/modules/xr/xr_input_source.idl
View file @ 4fff66e2
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
// found in the LICENSE file. // found in the LICENSE file.
enum XRHandedness { enum XRHandedness {
"none",
"left", "left",
"right" "right"
}; };
......
third_party/blink/web_tests/xr/getInputPose_handedness.html deleted 100644 → 0
View file @ 7973f37c
<!DOCTYPE html>
<script src="../resources/testharness.js"></script>
<script src="../resources/testharnessreport.js"></script>
<script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
<script src="file:///gen/device/vr/public/mojom/vr_service.mojom.js"></script>
<script src="../external/wpt/resources/chromium/webxr-test.js"></script>
<script src="../xr/resources/xr-internal-device-mocking.js"></script>
<script src="../xr/resources/xr-test-utils.js"></script>
<script src="../xr/resources/test-constants.js"></script>
<canvas id="webgl-canvas"></canvas>
<script>
let testName = "XRInputSources properly communicate their handedness";
let fakeDeviceInitParams = { supportsImmersive: true };
let requestSessionOptions = [{ mode: 'immersive-vr' }];
let testFunction =
(session, t, fakeDeviceController) => new Promise((resolve) => {
// Session must have a baseLayer or frame requests will be ignored.
session.updateRenderState({ baseLayer: new XRWebGLLayer(session, gl) });
// Need to have a valid pose or input events don't process.
fakeDeviceController.setXRPresentationFrameData(VALID_POSE_MATRIX, [{
eye:"left",
projectionMatrix: VALID_PROJECTION_MATRIX,
viewMatrix: VALID_VIEW_MATRIX
}, {
eye:"right",
projectionMatrix: VALID_PROJECTION_MATRIX,
viewMatrix: VALID_VIEW_MATRIX
}]);
let input_source = new MockXRInputSource();
input_source.targetRayMode = "tracked-pointer";
fakeDeviceController.addInputSource(input_source);
function CheckNone(time, xrFrame) {
let source = session.getInputSources()[0];
t.step( () => {
assert_not_equals(source, null);
// Handedness should be "none" by default.
assert_equals(source.handedness, "none");
});
input_source.handedness = "right"
session.requestAnimationFrame(CheckRight);
}
function CheckRight(time, xrFrame) {
let source = session.getInputSources()[0];
t.step( () => {
assert_not_equals(source, null);
// Handedness was set to "right", make sure it propegates.
assert_equals(source.handedness, "right");
});
input_source.handedness = "left";
session.requestAnimationFrame(CheckLeft);
}
function CheckLeft(time, xrFrame) {
let source = session.getInputSources()[0];
t.step( () => {
assert_not_equals(source, null);
// Handedness was set to "left", make sure it propegates.
assert_equals(source.handedness, "left");
});
input_source.handedness = "none";
session.requestAnimationFrame(CheckNoneAgain);
}
function CheckNoneAgain(time, xrFrame) {
let source = session.getInputSources()[0];
t.step( () => {
assert_not_equals(source, null);
// Handedness was set to "none" again, make sure it propegates.
assert_equals(source.handedness, "none");
});
resolve();
}
// Handedness only updates during an XR frame.
session.requestAnimationFrame(CheckNone);
});
xr_session_promise_test(
testFunction, fakeDeviceInitParams, requestSessionOptions, testName);
</script>
third_party/blink/web_tests/xr/xrInputSource_add_remove.html
View file @ 4fff66e2
...@@ -65,7 +65,7 @@ let testFunction = (session, t, fakeDeviceController) => new Promise((resolve) = ...@@ -65,7 +65,7 @@ let testFunction = (session, t, fakeDeviceController) => new Promise((resolve) =
t.step( () => { t.step( () => {
assert_equals(input_sources.length, 2); assert_equals(input_sources.length, 2);
assert_equals(input_sources[1].targetRayMode, "gaze"); assert_equals(input_sources[1].targetRayMode, "gaze");
assert_equals(input_sources[1].handedness, "none"); assert_equals(input_sources[1].handedness, "");
}); });
fakeDeviceController.removeInputSource(input_source_1); fakeDeviceController.removeInputSource(input_source_1);
...@@ -76,7 +76,7 @@ let testFunction = (session, t, fakeDeviceController) => new Promise((resolve) = ...@@ -76,7 +76,7 @@ let testFunction = (session, t, fakeDeviceController) => new Promise((resolve) =
t.step( () => { t.step( () => {
assert_equals(input_sources.length, 1); assert_equals(input_sources.length, 1);
assert_equals(input_sources[0].targetRayMode, "gaze"); assert_equals(input_sources[0].targetRayMode, "gaze");
assert_equals(input_sources[0].handedness, "none"); assert_equals(input_sources[0].handedness, "");
}); });
resolve(); resolve();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment