mirror of
https://github.com/servo/servo.git
synced 2025-08-07 06:25:32 +01:00
Auto merge of #26051 - Manishearth:openxr-context, r=jdm
Hook up new openxr context menu gesture to embedder context menu machinery Based on https://github.com/servo/servo/pull/26043/ Fixes https://github.com/servo/servo/issues/25797, #26057 https://github.com/servo/webxr/pull/144 needs to land first Currently when exited the Servo window is blurred, apparently we need to call `Window.Activate` on it. r? @jdm cc @paulrouget
This commit is contained in:
commit
b3c12ad9b3
5 changed files with 57 additions and 9 deletions
|
@ -5,7 +5,7 @@
|
|||
//! Abstract windowing methods. The concrete implementations of these can be found in `platform/`.
|
||||
|
||||
use canvas::{SurfaceProviders, WebGlExecutor};
|
||||
use embedder_traits::EventLoopWaker;
|
||||
use embedder_traits::{EmbedderProxy, EventLoopWaker};
|
||||
use euclid::Scale;
|
||||
#[cfg(feature = "gl")]
|
||||
use gleam::gl;
|
||||
|
@ -190,6 +190,7 @@ pub trait EmbedderMethods {
|
|||
_: &mut webxr::MainThreadRegistry,
|
||||
_: WebGlExecutor,
|
||||
_: SurfaceProviders,
|
||||
_: EmbedderProxy,
|
||||
) {
|
||||
}
|
||||
}
|
||||
|
|
|
@ -481,6 +481,7 @@ where
|
|||
&mut webxr_main_thread,
|
||||
webgl_executor,
|
||||
webxr_surface_providers,
|
||||
embedder_proxy.clone(),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
@ -521,7 +522,7 @@ where
|
|||
let (constellation_chan, sw_senders) = create_constellation(
|
||||
opts.user_agent.clone(),
|
||||
opts.config_dir.clone(),
|
||||
embedder_proxy.clone(),
|
||||
embedder_proxy,
|
||||
compositor_proxy.clone(),
|
||||
time_profiler_chan.clone(),
|
||||
mem_profiler_chan.clone(),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue