aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--components/script/document_loader.rs6
-rw-r--r--components/script/script_thread.rs1
2 files changed, 1 insertions, 6 deletions
diff --git a/components/script/document_loader.rs b/components/script/document_loader.rs
index 260424618bf..837660109c3 100644
--- a/components/script/document_loader.rs
+++ b/components/script/document_loader.rs
@@ -8,7 +8,6 @@
use dom::bindings::js::JS;
use dom::document::Document;
use ipc_channel::ipc::IpcSender;
-use msg::constellation_msg::PipelineId;
use net_traits::{CoreResourceMsg, FetchResponseMsg, ResourceThreads, IpcSend};
use net_traits::request::RequestInit;
use std::thread;
@@ -84,24 +83,21 @@ impl Drop for LoadBlocker {
#[derive(JSTraceable, HeapSizeOf)]
pub struct DocumentLoader {
resource_threads: ResourceThreads,
- pipeline: Option<PipelineId>,
blocking_loads: Vec<LoadType>,
events_inhibited: bool,
}
impl 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,
- pipeline: Option<PipelineId>,
initial_load: Option<Url>) -> DocumentLoader {
let initial_loads = initial_load.into_iter().map(LoadType::PageSource).collect();
DocumentLoader {
resource_threads: resource_threads,
- pipeline: pipeline,
blocking_loads: initial_loads,
events_inhibited: false,
}
diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs
index dfd5b0300b3..ec36cf64e0e 100644
--- a/components/script/script_thread.rs
+++ b/components/script/script_thread.rs
@@ -1729,7 +1729,6 @@ impl ScriptThread {
});
let loader = DocumentLoader::new_with_threads(self.resource_threads.clone(),
- Some(browsing_context.pipeline_id()),
Some(incomplete.url.clone()));
let is_html_document = match metadata.content_type {