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

clippy: Fix some issues issues in ports/servoshell (#31939)

Browse source 
* fix warnings in ports/servoshell

* fixed formatting
This commit is contained in:
Ekta Siwach 2024-04-01 01:33:37 +05:30 • committed by GitHub
parent bd287df0d4
commit 9243e8cf71
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 55 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

100
ports/servoshell/app.rs
View file

@ -142,62 +142,58 @@ impl App {
let now = Instant::now(); let now = Instant::now();
trace_winit_event!(event, "@{:?} (+{:?}) {event:?}", now - t_start, now - t); trace_winit_event!(event, "@{:?} (+{:?}) {event:?}", now - t_start, now - t);
t = now; t = now;
match event { if let winit::event::Event::NewEvents(winit::event::StartCause::Init) = event {
winit::event::Event::NewEvents(winit::event::StartCause::Init) => { let surfman = window.rendering_context();
let surfman = window.rendering_context();
let xr_discovery = if pref!(dom.webxr.glwindow.enabled) && !opts::get().headless
{
let window = window.clone();
// This should be safe because run_forever does, in fact,
// run forever. The event loop window target doesn't get
// moved, and does outlast this closure, and we won't
// 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())
};
let factory = Box::new(move || Ok(window.new_glwindow(w)));
Some(GlWindowDiscovery::new(
surfman.connection(),
surfman.adapter(),
surfman.context_attributes(),
factory,
))
} else {
None
};
let xr_discovery = if pref!(dom.webxr.glwindow.enabled) && !opts::get().headless {
let window = window.clone(); let window = window.clone();
// Implements embedder methods, used by libservo and constellation. // This should be safe because run_forever does, in fact,
let embedder = Box::new(EmbedderCallbacks::new(ev_waker.clone(), xr_discovery)); // run forever. The event loop window target doesn't get
// moved, and does outlast this closure, and we won't
let composite_target = if app.minibrowser.is_some() { // ever try to make use of it once shutdown begins and
CompositeTarget::Fbo // it stops being valid.
} else { let w = unsafe {
CompositeTarget::Window std::mem::transmute::<
&EventLoopWindowTarget<WakerEvent>,
&'static EventLoopWindowTarget<WakerEvent>,
>(w.unwrap())
}; };
let servo_data = Servo::new( let factory = Box::new(move || Ok(window.new_glwindow(w)));
embedder, Some(GlWindowDiscovery::new(
window.clone(), surfman.connection(),
user_agent.clone(), surfman.adapter(),
composite_target, surfman.context_attributes(),
); factory,
let mut servo = servo_data.servo; ))
} else {
None
};
servo.handle_events(vec![EmbedderEvent::NewWebView( let window = window.clone();
initial_url.to_owned(), // Implements embedder methods, used by libservo and constellation.
servo_data.browser_id, let embedder = Box::new(EmbedderCallbacks::new(ev_waker.clone(), xr_discovery));
)]);
servo.setup_logging();
app.windows.insert(window.id(), window.clone()); let composite_target = if app.minibrowser.is_some() {
app.servo = Some(servo); CompositeTarget::Fbo
}, } else {
_ => {}, CompositeTarget::Window
};
let servo_data = Servo::new(
embedder,
window.clone(),
user_agent.clone(),
composite_target,
);
let mut servo = servo_data.servo;
servo.handle_events(vec![EmbedderEvent::NewWebView(
initial_url.to_owned(),
servo_data.browser_id,
)]);
servo.setup_logging();
app.windows.insert(window.id(), window.clone());
app.servo = Some(servo);
} }
// If self.servo is None here, it means that we're in the process of shutting down, // If self.servo is None here, it means that we're in the process of shutting down,
@ -415,7 +411,7 @@ impl App {
// Take any outstanding embedder events from the App and its Windows. // Take any outstanding embedder events from the App and its Windows.
let mut embedder_events = self.get_events(); let mut embedder_events = self.get_events();
for (_win_id, window) in &self.windows { for window in self.windows.values() {
embedder_events.extend(window.get_events()); embedder_events.extend(window.get_events());
} }

1
ports/servoshell/headless_window.rs
View file

@ -32,6 +32,7 @@ pub struct Window {
} }
impl Window { impl Window {
#[allow(clippy::new_ret_no_self)]
pub fn new( pub fn new(
size: Size2D<u32, DeviceIndependentPixel>, size: Size2D<u32, DeviceIndependentPixel>,
device_pixel_ratio_override: Option<f32>, device_pixel_ratio_override: Option<f32>,

11
ports/servoshell/webview.rs
View file

@ -684,12 +684,13 @@ where
EmbedderMsg::ReadyToPresent => { EmbedderMsg::ReadyToPresent => {
need_present = true; need_present = true;
}, },
EmbedderMsg::EventDelivered(event) => match (webview_id, event) { EmbedderMsg::EventDelivered(event) => {
(Some(webview_id), CompositorEventVariant::MouseButtonEvent) => { if let (Some(webview_id), CompositorEventVariant::MouseButtonEvent) =
(webview_id, event)
{
// TODO Focus webview and/or raise to top if needed. // TODO Focus webview and/or raise to top if needed.
trace!("{}: Got a mouse button event", webview_id); trace!("{}: Got a mouse button event", webview_id);
}, }
(_, _) => {},
}, },
} }
} }
@ -761,7 +762,7 @@ fn platform_get_selected_devices(devices: Vec<String>) -> Option<String> {
#[cfg(not(target_os = "linux"))] #[cfg(not(target_os = "linux"))]
fn platform_get_selected_devices(devices: Vec<String>) -> Option<String> { fn platform_get_selected_devices(devices: Vec<String>) -> Option<String> {
for device in devices { for device in devices {
if let Some(address) = device.split("|").next().map(|s| s.to_string()) { if let Some(address) = device.split('|').next().map(|s| s.to_string()) {
return Some(address); return Some(address);
} }
} }