Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-31 03:00:29 +01:00
Code Issues Projects Releases Packages Wiki Activity

remove no-op InitializeCompositing message

Browse source
This commit is contained in:
Paul Rouget 2017-07-11 08:19:47 +02:00
parent ebfc8f5858
commit ff6dc856e6
4 changed files with 1 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/compositing/compositor.rs
View file

@ -742,10 +742,6 @@ impl<Window: WindowMethods> IOCompositor<Window> {
self.composite(); self.composite();
} }
WindowEvent::InitializeCompositing => {
self.initialize_compositing();
}
WindowEvent::Resize(size) => { WindowEvent::Resize(size) => {
self.on_resize_window_event(size); self.on_resize_window_event(size);
} }
@ -1566,9 +1562,6 @@ impl<Window: WindowMethods> IOCompositor<Window> {
} }
} }
fn initialize_compositing(&mut self) {
}
fn get_root_pipeline_id(&self) -> Option<PipelineId> { fn get_root_pipeline_id(&self) -> Option<PipelineId> {
self.root_pipeline.as_ref().map(|pipeline| pipeline.id) self.root_pipeline.as_ref().map(|pipeline| pipeline.id)
} }

4
components/compositing/windowing.rs
View file

@ -44,9 +44,6 @@ pub enum WindowEvent {
/// Sent when part of the window is marked dirty and needs to be redrawn. Before sending this /// Sent when part of the window is marked dirty and needs to be redrawn. Before sending this
/// message, the window must make the same GL context as in `PrepareRenderingEvent` current. /// message, the window must make the same GL context as in `PrepareRenderingEvent` current.
Refresh, Refresh,
/// Sent to initialize the GL context. The windowing system must have a valid, current GL
/// context when this message is sent.
InitializeCompositing,
/// Sent when the window is resized. /// Sent when the window is resized.
Resize(TypedSize2D<u32, DevicePixel>), Resize(TypedSize2D<u32, DevicePixel>),
/// Touchpad Pressure /// Touchpad Pressure
@ -85,7 +82,6 @@ impl Debug for WindowEvent {
match *self { match *self {
WindowEvent::Idle => write!(f, "Idle"), WindowEvent::Idle => write!(f, "Idle"),
WindowEvent::Refresh => write!(f, "Refresh"), WindowEvent::Refresh => write!(f, "Refresh"),
WindowEvent::InitializeCompositing => write!(f, "InitializeCompositing"),
WindowEvent::Resize(..) => write!(f, "Resize"), WindowEvent::Resize(..) => write!(f, "Resize"),
WindowEvent::TouchpadPressure(..) => write!(f, "TouchpadPressure"), WindowEvent::TouchpadPressure(..) => write!(f, "TouchpadPressure"),
WindowEvent::KeyEvent(..) => write!(f, "Key"), WindowEvent::KeyEvent(..) => write!(f, "Key"),

3
ports/cef/browser_host.rs
View file

@ -486,8 +486,7 @@ full_cef_class_impl! {
this.downcast().send_window_event(WindowEvent::PinchZoom((new_zoom_level / old_zoom_level) as f32)) this.downcast().send_window_event(WindowEvent::PinchZoom((new_zoom_level / old_zoom_level) as f32))
}} }}
fn initialize_compositing(&this,) -> () {{ fn initialize_compositing(&_this,) -> () {{
this.downcast().send_window_event(WindowEvent::InitializeCompositing);
}} }}
fn composite(&this,) -> () {{ fn composite(&this,) -> () {{

2
ports/servo/main.rs
View file

@ -165,8 +165,6 @@ fn main() {
register_glutin_resize_handler(&window, &mut browser); register_glutin_resize_handler(&window, &mut browser);
browser.browser.handle_events(vec![WindowEvent::InitializeCompositing]);
// Feed events from the window to the browser until the browser // Feed events from the window to the browser until the browser
// says to stop. // says to stop.
loop { loop {