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

Remove a spurious field from the SetFrameTree message.

Browse source
This commit is contained in:
Ms2ger 2016-06-03 11:43:46 +02:00
parent a80767993b
commit 863cb03eca
3 changed files with 5 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

9
components/compositing/compositor.rs
View file

@ -576,9 +576,9 @@ impl<Window: WindowMethods> IOCompositor<Window> {
self.change_page_url(pipeline_id, url);
}
(Msg::SetFrameTree(frame_tree, response_chan, new_constellation_chan),
(Msg::SetFrameTree(frame_tree, response_chan),
ShutdownState::NotShuttingDown) => {
self.set_frame_tree(&frame_tree, response_chan, new_constellation_chan);
self.set_frame_tree(&frame_tree, response_chan);
self.send_viewport_rects_for_all_layers();
self.title_for_main_frame();
}
@ -846,8 +846,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
fn set_frame_tree(&mut self,
frame_tree: &SendableFrameTree,
response_chan: IpcSender<()>,
new_constellation_chan: Sender<ConstellationMsg>) {
response_chan: IpcSender<()>) {
if let Err(e) = response_chan.send(()) {
warn!("Sending reponse to set frame tree failed ({}).", e);
}
@ -874,8 +873,6 @@ impl<Window: WindowMethods> IOCompositor<Window> {
self.create_pipeline_details_for_frame_tree(&frame_tree);
// Initialize the new constellation channel by sending it the root window size.
self.constellation_chan = new_constellation_chan;
self.send_window_size(WindowSizeType::Initial);
self.frame_tree_id.next();

2
components/compositing/compositor_thread.rs
View file

@ -141,7 +141,7 @@ pub enum Msg {
/// Alerts the compositor that the given pipeline has changed whether it is running animations.
ChangeRunningAnimationsState(PipelineId, AnimationState),
/// Replaces the current frame tree, typically called during main frame navigation.
SetFrameTree(SendableFrameTree, IpcSender<()>, Sender<ConstellationMsg>),
SetFrameTree(SendableFrameTree, IpcSender<()>),
/// The load of a page has begun: (can go back, can go forward).
LoadStart(bool, bool),
/// The load of a page has completed: (can go back, can go forward, is root frame).