mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Only store the url inside a pipeline instead of the rest of the LoadData.
This commit is contained in:
parent
e2c4f5ed67
commit
6351fc75fd
13 changed files with 34 additions and 27 deletions
|
@ -16,6 +16,7 @@ use msg::constellation_msg::{LoadData, WindowSizeData, PipelineExitType};
|
|||
use net::image_cache_task::ImageCacheTask;
|
||||
use net::resource_task::ResourceTask;
|
||||
use net::storage_task::StorageTask;
|
||||
use url::Url;
|
||||
use util::time::TimeProfilerChan;
|
||||
use std::rc::Rc;
|
||||
use std::sync::mpsc::{Receiver, channel};
|
||||
|
@ -29,8 +30,8 @@ pub struct Pipeline {
|
|||
pub paint_chan: PaintChan,
|
||||
pub layout_shutdown_port: Receiver<()>,
|
||||
pub paint_shutdown_port: Receiver<()>,
|
||||
/// Load data corresponding to the most recently-loaded page.
|
||||
pub load_data: LoadData,
|
||||
/// URL corresponding to the most recently-loaded page.
|
||||
pub url: Url,
|
||||
/// The title of the most recently-loaded page.
|
||||
pub title: Option<String>,
|
||||
}
|
||||
|
@ -137,7 +138,7 @@ impl Pipeline {
|
|||
paint_chan,
|
||||
layout_shutdown_port,
|
||||
paint_shutdown_port,
|
||||
load_data)
|
||||
load_data.url)
|
||||
}
|
||||
|
||||
pub fn new(id: PipelineId,
|
||||
|
@ -147,7 +148,7 @@ impl Pipeline {
|
|||
paint_chan: PaintChan,
|
||||
layout_shutdown_port: Receiver<()>,
|
||||
paint_shutdown_port: Receiver<()>,
|
||||
load_data: LoadData)
|
||||
url: Url)
|
||||
-> Pipeline {
|
||||
Pipeline {
|
||||
id: id,
|
||||
|
@ -157,7 +158,7 @@ impl Pipeline {
|
|||
paint_chan: paint_chan,
|
||||
layout_shutdown_port: layout_shutdown_port,
|
||||
paint_shutdown_port: paint_shutdown_port,
|
||||
load_data: load_data,
|
||||
url: url,
|
||||
title: None,
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue