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

Remove LayoutControlChan.

Browse source
This commit is contained in:
Ms2ger 2016-05-27 14:00:42 +02:00
parent e3b2d6aef0
commit ec03c367ab
8 changed files with 14 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/compositing/compositor.rs
View file

@ -27,7 +27,7 @@ use layers::platform::surface::NativeDisplay;
use layers::rendergl;
use layers::rendergl::RenderContext;
use layers::scene::Scene;
use layout_traits::{ConvertPipelineIdToWebRender, LayoutControlChan};
use layout_traits::ConvertPipelineIdToWebRender;
use msg::constellation_msg::{Image, PixelFormat};
use msg::constellation_msg::{Key, KeyModifiers, KeyState, LoadData};
use msg::constellation_msg::{NavigationDirection, PipelineId, PipelineIndex, PipelineNamespaceId};
@ -1668,9 +1668,8 @@ impl<Window: WindowMethods> IOCompositor<Window> {
for (pipeline_id, new_visible_rects) in &new_visible_rects {
if let Some(pipeline_details) = self.pipeline_details.get(&pipeline_id) {
if let Some(ref pipeline) = pipeline_details.pipeline {
let LayoutControlChan(ref sender) = pipeline.layout_chan;
let msg = LayoutControlMsg::SetVisibleRects((*new_visible_rects).clone());
if let Err(e) = sender.send(msg) {
if let Err(e) = pipeline.layout_chan.send(msg) {
warn!("Sending layout control message failed ({}).", e);
}
}

5
components/compositing/lib.rs
View file

@ -41,9 +41,8 @@ pub use compositor_thread::{CompositorEventListener, CompositorProxy, Compositor
use euclid::size::TypedSize2D;
use gfx::paint_thread::ChromeToPaintMsg;
use ipc_channel::ipc::IpcSender;
use layout_traits::LayoutControlChan;
use msg::constellation_msg::PipelineId;
use script_traits::ConstellationControlMsg;
use script_traits::{ConstellationControlMsg, LayoutControlMsg};
use std::sync::mpsc::Sender;
use util::geometry::PagePx;
@ -66,6 +65,6 @@ pub struct SendableFrameTree {
pub struct CompositionPipeline {
pub id: PipelineId,
pub script_chan: IpcSender<ConstellationControlMsg>,
pub layout_chan: LayoutControlChan,
pub layout_chan: IpcSender<LayoutControlMsg>,
pub chrome_to_paint_chan: Sender<ChromeToPaintMsg>,
}