aboutsummaryrefslogtreecommitdiffstats
path: root/components/script
diff options
context:
space:
mode:
Diffstat (limited to 'components/script')
-rw-r--r--components/script/dom/servohtmlparser.rs6
-rw-r--r--components/script/script_thread.rs10
2 files changed, 8 insertions, 8 deletions
diff --git a/components/script/dom/servohtmlparser.rs b/components/script/dom/servohtmlparser.rs
index 92658189dc0..75d6a5e502f 100644
--- a/components/script/dom/servohtmlparser.rs
+++ b/components/script/dom/servohtmlparser.rs
@@ -94,9 +94,9 @@ impl AsyncResponseListener for ParserContext {
Err(_) => None,
};
let content_type = metadata.clone().and_then(|meta| meta.content_type);
- let parser = match ScriptThread::page_fetch_complete(&self.id,
- self.subpage.as_ref(),
- metadata) {
+ let parser = match ScriptThread::page_headers_available(&self.id,
+ self.subpage.as_ref(),
+ metadata) {
Some(parser) => parser,
None => return,
};
diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs
index 5f83a467076..164a47adb7e 100644
--- a/components/script/script_thread.rs
+++ b/components/script/script_thread.rs
@@ -477,11 +477,11 @@ pub unsafe extern "C" fn shadow_check_callback(_cx: *mut JSContext,
}
impl ScriptThread {
- pub fn page_fetch_complete(id: &PipelineId, subpage: Option<&SubpageId>, metadata: Option<Metadata>)
- -> Option<ParserRoot> {
+ pub fn page_headers_available(id: &PipelineId, subpage: Option<&SubpageId>, metadata: Option<Metadata>)
+ -> Option<ParserRoot> {
SCRIPT_THREAD_ROOT.with(|root| {
let script_thread = unsafe { &*root.borrow().unwrap() };
- script_thread.handle_page_fetch_complete(id, subpage, metadata)
+ script_thread.handle_page_headers_available(id, subpage, metadata)
})
}
@@ -1298,8 +1298,8 @@ impl ScriptThread {
/// We have received notification that the response associated with a load has completed.
/// Kick off the document and frame tree creation process using the result.
- fn handle_page_fetch_complete(&self, id: &PipelineId, subpage: Option<&SubpageId>,
- metadata: Option<Metadata>) -> Option<ParserRoot> {
+ fn handle_page_headers_available(&self, id: &PipelineId, subpage: Option<&SubpageId>,
+ metadata: Option<Metadata>) -> Option<ParserRoot> {
let idx = self.incomplete_loads.borrow().iter().position(|load| {
load.pipeline_id == *id && load.parent_info.as_ref().map(|info| &info.1) == subpage
});