aboutsummaryrefslogtreecommitdiffstats
path: root/ports/winit/window_trait.rs
diff options
context:
space:
mode:
Diffstat (limited to 'ports/winit/window_trait.rs')
-rw-r--r--ports/winit/window_trait.rs11
1 files changed, 7 insertions, 4 deletions
diff --git a/ports/winit/window_trait.rs b/ports/winit/window_trait.rs
index a6faa676589..e02f7dfba60 100644
--- a/ports/winit/window_trait.rs
+++ b/ports/winit/window_trait.rs
@@ -5,7 +5,7 @@
//! Definition of Window.
//! Implemented by headless and headed windows.
-use crate::events_loop::EventsLoop;
+use crate::events_loop::ServoEvent;
use servo::compositing::windowing::{WindowEvent, WindowMethods};
use servo::embedder_traits::Cursor;
use servo::webrender_api::units::{DeviceIntPoint, DeviceIntSize};
@@ -16,16 +16,19 @@ pub const LINE_HEIGHT: f32 = 38.0;
pub trait WindowPortsMethods: WindowMethods {
fn get_events(&self) -> Vec<WindowEvent>;
- fn id(&self) -> winit::WindowId;
+ fn id(&self) -> winit::window::WindowId;
fn has_events(&self) -> bool;
fn page_height(&self) -> f32;
fn get_fullscreen(&self) -> bool;
- fn winit_event_to_servo_event(&self, event: winit::WindowEvent);
+ fn winit_event_to_servo_event(&self, event: winit::event::WindowEvent);
fn is_animating(&self) -> bool;
fn set_title(&self, _title: &str) {}
fn set_inner_size(&self, _size: DeviceIntSize) {}
fn set_position(&self, _point: DeviceIntPoint) {}
fn set_fullscreen(&self, _state: bool) {}
fn set_cursor(&self, _cursor: Cursor) {}
- fn new_glwindow(&self, events_loop: &EventsLoop) -> Box<dyn webxr::glwindow::GlWindow>;
+ fn new_glwindow(
+ &self,
+ events_loop: &winit::event_loop::EventLoopWindowTarget<ServoEvent>
+ ) -> Box<dyn webxr::glwindow::GlWindow>;
}