mirror of
https://github.com/servo/servo.git
synced 2025-08-06 22:15:33 +01:00
Pass a Sender<ConstellationControlMsg> to Pipeline::new.
This commit is contained in:
parent
250fdc33f4
commit
0aae98e9c0
2 changed files with 10 additions and 11 deletions
|
@ -41,7 +41,7 @@ use offscreen_gl_context::GLContextAttributes;
|
|||
use profile_traits::mem;
|
||||
use profile_traits::time;
|
||||
use script_traits::{CompositorEvent, ConstellationControlMsg, LayoutControlMsg};
|
||||
use script_traits::{ScriptControlChan, ScriptState, ScriptTaskFactory};
|
||||
use script_traits::{ScriptState, ScriptTaskFactory};
|
||||
use std::borrow::ToOwned;
|
||||
use std::collections::HashMap;
|
||||
use std::io::{self, Write};
|
||||
|
@ -287,7 +287,7 @@ impl<LTF: LayoutTaskFactory, STF: ScriptTaskFactory> Constellation<LTF, STF> {
|
|||
fn new_pipeline(&mut self,
|
||||
parent_info: Option<(PipelineId, SubpageId)>,
|
||||
initial_window_rect: Option<TypedRect<PagePx, f32>>,
|
||||
script_channel: Option<ScriptControlChan>,
|
||||
script_channel: Option<Sender<ConstellationControlMsg>>,
|
||||
load_data: LoadData)
|
||||
-> PipelineId {
|
||||
let pipeline_id = self.next_pipeline_id;
|
||||
|
@ -648,7 +648,7 @@ impl<LTF: LayoutTaskFactory, STF: ScriptTaskFactory> Constellation<LTF, STF> {
|
|||
if same_script {
|
||||
debug!("Constellation: loading same-origin iframe, \
|
||||
parent url {:?}, iframe url {:?}", source_url, url);
|
||||
Some(ScriptControlChan(source_pipeline.script_chan.clone()))
|
||||
Some(source_pipeline.script_chan.clone())
|
||||
} else {
|
||||
debug!("Constellation: loading cross-origin iframe, \
|
||||
parent url {:?}, iframe url {:?}", source_url, url);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue