Commit 7c3e32e6 authored by Daniel Cheng's avatar Daniel Cheng Committed by Commit Bot

WebXR cleanup: don't wrap Mojo interfaces pointers in Optional.

Mojo interface pointers are already nullable, so don't have double
nullable pointers.

Bug: 836564
Change-Id: Ia49842ed9549a0e22efc97fde1e852a17e4d7400
Reviewed-on: https://chromium-review.googlesource.com/1050911
Commit-Queue: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: default avatarDavid Dorwin <ddorwin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#557106}
parent 65e2f6ed
......@@ -320,9 +320,9 @@ void XRFrameProvider::OnExclusiveVSync(
// execution context caused extreme input delay due to processing
// multiple frames without yielding, see crbug.com/701444.
Platform::Current()->CurrentThread()->GetTaskRunner()->PostTask(
FROM_HERE, WTF::Bind(&XRFrameProvider::ProcessScheduledFrame,
WrapWeakPersistent(this), base::nullopt,
time_delta.InSecondsF()));
FROM_HERE,
WTF::Bind(&XRFrameProvider::ProcessScheduledFrame,
WrapWeakPersistent(this), nullptr, time_delta.InSecondsF()));
}
void XRFrameProvider::OnNonExclusiveVSync(double timestamp) {
......@@ -337,7 +337,7 @@ void XRFrameProvider::OnNonExclusiveVSync(double timestamp) {
Platform::Current()->CurrentThread()->GetTaskRunner()->PostTask(
FROM_HERE, WTF::Bind(&XRFrameProvider::ProcessScheduledFrame,
WrapWeakPersistent(this), base::nullopt, timestamp));
WrapWeakPersistent(this), nullptr, timestamp));
}
void XRFrameProvider::OnNonExclusivePose(device::mojom::blink::VRPosePtr pose) {
......@@ -396,7 +396,7 @@ void XRFrameProvider::RenderBackgroundImage(
}
void XRFrameProvider::ProcessScheduledFrame(
base::Optional<device::mojom::blink::VRMagicWindowFrameDataPtr> frame_data,
device::mojom::blink::VRMagicWindowFrameDataPtr frame_data,
double timestamp) {
DVLOG(2) << __FUNCTION__;
......@@ -441,7 +441,7 @@ void XRFrameProvider::ProcessScheduledFrame(
if (frame_data) {
// TODO(https://crbug.com/837883): only render background for
// sessions that are using AR.
RenderBackgroundImage(frame_data.value(), session);
RenderBackgroundImage(frame_data, session);
}
if (frame_pose_ && frame_pose_->input_state.has_value()) {
......@@ -450,8 +450,7 @@ void XRFrameProvider::ProcessScheduledFrame(
}
if (frame_data) {
session->SetNonExclusiveProjectionMatrix(
frame_data.value()->projection_matrix);
session->SetNonExclusiveProjectionMatrix(frame_data->projection_matrix);
}
std::unique_ptr<TransformationMatrix> pose_matrix =
......
......@@ -62,8 +62,7 @@ class XRFrameProvider final
device::mojom::blink::VRDisplayFrameTransportOptionsPtr);
void OnPresentationProviderConnectionError();
void ProcessScheduledFrame(
base::Optional<device::mojom::blink::VRMagicWindowFrameDataPtr>
frame_data,
device::mojom::blink::VRMagicWindowFrameDataPtr frame_data,
double timestamp);
void RenderBackgroundImage(
......
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