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

Upgrade to egui@0.29.1 and winit@0.30.5 (#33751)

Browse source 
* update egui dependencies

Signed-off-by: Gae24 <96017547+Gae24@users.noreply.github.com>

* update glow to 0.14.1

Signed-off-by: Gae24 <96017547+Gae24@users.noreply.github.com>

* update winit to 0.30.5

Signed-off-by: Gae24 <96017547+Gae24@users.noreply.github.com>

* update servo-tidy.toml

Signed-off-by: Gae24 <96017547+Gae24@users.noreply.github.com>

* Use more imports to avoid qualified usage, fix build, and silence warnings about deprecated methods

Signed-off-by: Martin Robinson <mrobinson@igalia.com>

---------

Signed-off-by: Gae24 <96017547+Gae24@users.noreply.github.com>
Signed-off-by: Martin Robinson <mrobinson@igalia.com>
Co-authored-by: Martin Robinson <mrobinson@igalia.com>
This commit is contained in:
Gae24 2024-10-10 19:18:03 +02:00 • committed by GitHub
parent 6b3a316e1b
commit fd19409f31
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 339 additions and 182 deletions
Download patch file Download diff file Expand all files Collapse all files

18
ports/servoshell/desktop/app.rs
View file

@ -22,7 +22,7 @@ use webxr::glwindow::GlWindowDiscovery;
#[cfg(target_os = "windows")]
use webxr::openxr::{AppInfo, OpenXrDiscovery};
use winit::event::WindowEvent;
use winit::event_loop::EventLoopWindowTarget;
use winit::event_loop::ActiveEventLoop;
use winit::window::WindowId;
use super::events_loop::{EventsLoop, WakerEvent};
@ -80,7 +80,7 @@ impl App {
} else {
Rc::new(headed_window::Window::new(
opts::get().initial_window_size,
&events_loop,
&events_loop.as_winit(),
no_native_titlebar,
device_pixel_ratio_override,
))
@ -116,7 +116,12 @@ impl App {
debug_assert_eq!(webrender_gl.get_error(), gleam::gl::NO_ERROR);
app.minibrowser = Some(
Minibrowser::new(&rendering_context, &events_loop, initial_url.clone()).into(),
Minibrowser::new(
&rendering_context,
&events_loop.as_winit(),
initial_url.clone(),
)
.into(),
);
}
@ -164,10 +169,9 @@ impl App {
// ever try to make use of it once shutdown begins and
// it stops being valid.
let w = unsafe {
std::mem::transmute::<
&EventLoopWindowTarget<WakerEvent>,
&'static EventLoopWindowTarget<WakerEvent>,
>(w.unwrap())
std::mem::transmute::<&ActiveEventLoop, &'static ActiveEventLoop>(
w.unwrap(),
)
};
let factory = Box::new(move || Ok(window.new_glwindow(w)));
Some(XrDiscovery::GlWindow(GlWindowDiscovery::new(