Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-09-30 16:49:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

Avoid recompiling script every time surfman changes

Browse source
This commit is contained in:
Alan Jeffrey 2019-11-15 09:18:55 -06:00
parent f890d2e21d
commit 124de75089
13 changed files with 36 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ports/glutin/embedder.rs
View file

@ -89,7 +89,7 @@ impl EmbedderMethods for EmbedderCallbacks {
}
}
fn register_webxr(&mut self, xr: &mut webxr_api::MainThreadRegistry) {
fn register_webxr(&mut self, xr: &mut webxr::MainThreadRegistry) {
if pref!(dom.webxr.test) {
xr.register_mock(webxr::headless::HeadlessMockDiscovery::new());
} else if !opts::get().headless && pref!(dom.webxr.glwindow) {

4
ports/libsimpleservo/api/Cargo.toml
View file

@ -13,7 +13,7 @@ log = "0.4"
servo-media = { git = "https://github.com/servo/media" }
webxr-api = { git = "https://github.com/servo/webxr", features = ["ipc"] }
webxr = { git = "https://github.com/servo/webxr" , optional = true}
webxr = { git = "https://github.com/servo/webxr"}
[target.'cfg(not(target_os = "macos"))'.dependencies]
libc = "0.2"
@ -47,5 +47,5 @@ no_static_freetype = ["libservo/no_static_freetype"]
no-wgl = ["libservo/no-wgl"]
oculusvr = ["libservo/oculusvr"]
webdriver = ["libservo/webdriver"]
uwp = ["libservo/uwp", "webxr", "webxr/openxr-api"]
uwp = ["libservo/uwp", "webxr/openxr-api"]
webgl_backtrace = ["libservo/webgl_backtrace"]

8
ports/libsimpleservo/api/src/lib.rs
View file

@ -49,7 +49,7 @@ pub struct InitOptions {
pub coordinates: Coordinates,
pub density: f32,
pub vr_init: VRInitOptions,
pub xr_discovery: Option<Box<dyn webxr_api::Discovery>>,
pub xr_discovery: Option<webxr::Discovery>,
pub enable_subpixel_text_antialiasing: bool,
pub gl_context_pointer: Option<*const c_void>,
pub native_display_pointer: Option<*const c_void>,
@ -591,7 +591,7 @@ impl ServoGlue {
struct ServoEmbedderCallbacks {
waker: Box<dyn EventLoopWaker>,
xr_discovery: Option<Box<dyn webxr_api::Discovery>>,
xr_discovery: Option<webxr::Discovery>,
vr_init: VRInitOptions,
#[allow(unused)]
gl: Rc<dyn gl::Gl>,
@ -626,7 +626,7 @@ impl EmbedderMethods for ServoEmbedderCallbacks {
}
#[cfg(feature = "uwp")]
fn register_webxr(&mut self, registry: &mut webxr_api::MainThreadRegistry) {
fn register_webxr(&mut self, registry: &mut webxr::MainThreadRegistry) {
debug!("EmbedderMethods::register_xr");
assert!(
self.xr_discovery.is_none(),
@ -638,7 +638,7 @@ impl EmbedderMethods for ServoEmbedderCallbacks {
}
#[cfg(not(feature = "uwp"))]
fn register_webxr(&mut self, registry: &mut webxr_api::MainThreadRegistry) {
fn register_webxr(&mut self, registry: &mut webxr::MainThreadRegistry) {
debug!("EmbedderMethods::register_xr");
if let Some(discovery) = self.xr_discovery.take() {
registry.register(discovery);