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

Remove Constellation::child_processes.

Browse source 
Fixes https://github.com/servo/servo/issues/11459.
This commit is contained in:
Corey Farwell 2016-12-09 11:00:24 -10:00
parent 120b003195
commit 8dfbfc2c48
2 changed files with 15 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

13
components/constellation/constellation.rs
View file

@ -35,7 +35,7 @@ use net_traits::image_cache_thread::ImageCacheThread;
use net_traits::pub_domains::reg_suffix;
use net_traits::storage_thread::{StorageThreadMsg, StorageType};
use offscreen_gl_context::{GLContextAttributes, GLLimits};
use pipeline::{ChildProcess, InitialPipelineState, Pipeline};
use pipeline::{InitialPipelineState, Pipeline};
use profile_traits::mem;
use profile_traits::time;
use rand::{Rng, SeedableRng, StdRng, random};
@ -175,10 +175,6 @@ pub struct Constellation<Message, LTF, STF> {
scheduler_chan: IpcSender<TimerEventRequest>,
/// A list of child content processes.
#[cfg_attr(target_os = "windows", allow(dead_code))]
child_processes: Vec<ChildProcess>,
/// Document states for loaded pipelines (used only when writing screenshots).
document_states: HashMap<PipelineId, DocumentState>,
@ -558,7 +554,6 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF>
phantom: PhantomData,
webdriver: WebDriverData::new(),
scheduler_chan: TimerScheduler::start(),
child_processes: Vec::new(),
document_states: HashMap::new(),
webrender_api_sender: state.webrender_api_sender,
shutting_down: false,
@ -679,15 +674,11 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF>
is_private: is_private,
});
let (pipeline, child_process) = match result {
let pipeline = match result {
Ok(result) => result,
Err(e) => return self.handle_send_error(pipeline_id, e),
};
if let Some(child_process) = child_process {
self.child_processes.push(child_process);
}
if let Some(host) = host {
self.script_channels.entry(top_level_frame_id)
.or_insert_with(HashMap::new)