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 unnecessary layout_chan

Browse source
This commit is contained in:
Hayden Faulds 2015-11-12 13:52:08 +00:00
parent 5e7bf9cd9c
commit c0f497d4ac
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/layout/layout_task.rs
View file

@ -50,7 +50,7 @@ use query::{MarginPadding, MarginRetrievingFragmentBorderBoxIterator, PositionPr
use query::{PositionRetrievingFragmentBorderBoxIterator, Side}; use query::{PositionRetrievingFragmentBorderBoxIterator, Side};
use script::dom::node::LayoutData; use script::dom::node::LayoutData;
use script::layout_interface::Animation; use script::layout_interface::Animation;
use script::layout_interface::{LayoutChan, LayoutRPC, OffsetParentResponse}; use script::layout_interface::{LayoutRPC, OffsetParentResponse};
use script::layout_interface::{Msg, NewLayoutTaskInfo, Reflow, ReflowGoal, ReflowQueryType}; use script::layout_interface::{Msg, NewLayoutTaskInfo, Reflow, ReflowGoal, ReflowQueryType};
use script::layout_interface::{ScriptLayoutChan, ScriptReflow, TrustedNodeAddress}; use script::layout_interface::{ScriptLayoutChan, ScriptReflow, TrustedNodeAddress};
use script_traits::{ConstellationControlMsg, LayoutControlMsg, OpaqueScriptLayoutChannel}; use script_traits::{ConstellationControlMsg, LayoutControlMsg, OpaqueScriptLayoutChannel};
@ -241,7 +241,6 @@ impl LayoutTaskFactory for LayoutTask {
move || { move || {
{ // Ensures layout task is destroyed before we send shutdown message { // Ensures layout task is destroyed before we send shutdown message
let sender = chan.sender(); let sender = chan.sender();
let layout_chan = LayoutChan(sender);
let layout = LayoutTask::new(id, let layout = LayoutTask::new(id,
url, url,
is_iframe, is_iframe,
@ -258,7 +257,7 @@ impl LayoutTaskFactory for LayoutTask {
let reporter_name = format!("layout-reporter-{}", id); let reporter_name = format!("layout-reporter-{}", id);
mem_profiler_chan.run_with_memory_reporting(|| { mem_profiler_chan.run_with_memory_reporting(|| {
layout.start(); layout.start();
}, reporter_name, layout_chan.0, Msg::CollectReports); }, reporter_name, sender, Msg::CollectReports);
} }
shutdown_chan.send(()).unwrap(); shutdown_chan.send(()).unwrap();
}, ConstellationMsg::Failure(failure_msg), con_chan); }, ConstellationMsg::Failure(failure_msg), con_chan);