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

Remove unnecessary recv in the constellation

Browse source
This commit is contained in:
Connor Brewster 2017-06-23 17:42:18 -06:00
parent 3e4021ef1a
commit a92ba8784b
3 changed files with 6 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

13
components/compositing/compositor.rs
View file

@ -10,7 +10,7 @@ use euclid::{Point2D, TypedPoint2D, TypedVector2D, TypedRect, ScaleFactor, Typed
use gfx_traits::Epoch; use gfx_traits::Epoch;
use gleam::gl; use gleam::gl;
use image::{DynamicImage, ImageFormat, RgbImage}; use image::{DynamicImage, ImageFormat, RgbImage};
use ipc_channel::ipc::{self, IpcSender, IpcSharedMemory}; use ipc_channel::ipc::{self, IpcSharedMemory};
use msg::constellation_msg::{Key, KeyModifiers, KeyState, CONTROL}; use msg::constellation_msg::{Key, KeyModifiers, KeyState, CONTROL};
use msg::constellation_msg::{PipelineId, PipelineIndex, PipelineNamespaceId, TraversalDirection}; use msg::constellation_msg::{PipelineId, PipelineIndex, PipelineNamespaceId, TraversalDirection};
use net_traits::image::base::{Image, PixelFormat}; use net_traits::image::base::{Image, PixelFormat};
@ -459,9 +459,9 @@ impl<Window: WindowMethods> IOCompositor<Window> {
self.change_page_title(pipeline_id, title); self.change_page_title(pipeline_id, title);
} }
(Msg::SetFrameTree(frame_tree, response_chan), (Msg::SetFrameTree(frame_tree),
ShutdownState::NotShuttingDown) => { ShutdownState::NotShuttingDown) => {
self.set_frame_tree(&frame_tree, response_chan); self.set_frame_tree(&frame_tree);
self.send_viewport_rects(); self.send_viewport_rects();
self.title_for_main_frame(); self.title_for_main_frame();
} }
@ -673,13 +673,8 @@ impl<Window: WindowMethods> IOCompositor<Window> {
} }
} }
fn set_frame_tree(&mut self, fn set_frame_tree(&mut self, frame_tree: &SendableFrameTree) {
frame_tree: &SendableFrameTree,
response_chan: IpcSender<()>) {
debug!("Setting the frame tree for pipeline {}", frame_tree.pipeline.id); debug!("Setting the frame tree for pipeline {}", frame_tree.pipeline.id);
if let Err(e) = response_chan.send(()) {
warn!("Sending reponse to set frame tree failed ({}).", e);
}
self.root_pipeline = Some(frame_tree.pipeline.clone()); self.root_pipeline = Some(frame_tree.pipeline.clone());

2
components/compositing/compositor_thread.rs
View file

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

8
components/constellation/constellation.rs
View file

@ -2870,13 +2870,7 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF>
// with low-resource scenarios. // with low-resource scenarios.
debug!("Sending frame tree for browsing context {}.", browsing_context_id); debug!("Sending frame tree for browsing context {}.", browsing_context_id);
if let Some(frame_tree) = self.browsing_context_to_sendable(browsing_context_id) { if let Some(frame_tree) = self.browsing_context_to_sendable(browsing_context_id) {
let (chan, port) = ipc::channel().expect("Failed to create IPC channel!"); self.compositor_proxy.send(ToCompositorMsg::SetFrameTree(frame_tree));
self.compositor_proxy.send(ToCompositorMsg::SetFrameTree(frame_tree,
chan));
if port.recv().is_err() {
warn!("Compositor has discarded SetFrameTree");
return; // Our message has been discarded, probably shutting down.
}
} }
} }