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

Remove DocumentLoader::pipeline.

Browse source
This commit is contained in:
Ms2ger 2016-10-10 18:34:28 +02:00
parent 7b905a5590
commit d0323e3a50
2 changed files with 1 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/script/document_loader.rs
View file

@ -8,7 +8,6 @@
use dom::bindings::js::JS; use dom::bindings::js::JS;
use dom::document::Document; use dom::document::Document;
use ipc_channel::ipc::IpcSender; use ipc_channel::ipc::IpcSender;
use msg::constellation_msg::PipelineId;
use net_traits::{CoreResourceMsg, FetchResponseMsg, ResourceThreads, IpcSend}; use net_traits::{CoreResourceMsg, FetchResponseMsg, ResourceThreads, IpcSend};
use net_traits::request::RequestInit; use net_traits::request::RequestInit;
use std::thread; use std::thread;
@ -84,24 +83,21 @@ impl Drop for LoadBlocker {
#[derive(JSTraceable, HeapSizeOf)] #[derive(JSTraceable, HeapSizeOf)]
pub struct DocumentLoader { pub struct DocumentLoader {
resource_threads: ResourceThreads, resource_threads: ResourceThreads,
pipeline: Option<PipelineId>,
blocking_loads: Vec<LoadType>, blocking_loads: Vec<LoadType>,
events_inhibited: bool, events_inhibited: bool,
} }
impl DocumentLoader { impl DocumentLoader {
pub fn new(existing: &DocumentLoader) -> DocumentLoader { pub fn new(existing: &DocumentLoader) -> DocumentLoader {
DocumentLoader::new_with_threads(existing.resource_threads.clone(), None, None) DocumentLoader::new_with_threads(existing.resource_threads.clone(), None)
} }
pub fn new_with_threads(resource_threads: ResourceThreads, pub fn new_with_threads(resource_threads: ResourceThreads,
pipeline: Option<PipelineId>,
initial_load: Option<Url>) -> DocumentLoader { initial_load: Option<Url>) -> DocumentLoader {
let initial_loads = initial_load.into_iter().map(LoadType::PageSource).collect(); let initial_loads = initial_load.into_iter().map(LoadType::PageSource).collect();
DocumentLoader { DocumentLoader {
resource_threads: resource_threads, resource_threads: resource_threads,
pipeline: pipeline,
blocking_loads: initial_loads, blocking_loads: initial_loads,
events_inhibited: false, events_inhibited: false,
} }

1
components/script/script_thread.rs
View file

@ -1729,7 +1729,6 @@ impl ScriptThread {
}); });
let loader = DocumentLoader::new_with_threads(self.resource_threads.clone(), let loader = DocumentLoader::new_with_threads(self.resource_threads.clone(),
Some(browsing_context.pipeline_id()),
Some(incomplete.url.clone())); Some(incomplete.url.clone()));
let is_html_document = match metadata.content_type { let is_html_document = match metadata.content_type {