mirror of
https://github.com/servo/servo.git
synced 2025-08-04 13:10:20 +01:00
Use fn pipeline_id consistently, not fn pipeline
Consistently use the name 'pipeline_id' to refer to a function that returns an (optional) PipelineId. This was prompted by discovering both fn pipeline and fn pipeline_id doing the same job in htmliframeelement.rs. Note that there is fn pipeline in components/compositing/compositor.rs, but that actually returns an Option<&CompositionPipeline>, not any kind of PipelineId.
This commit is contained in:
parent
bb53da6957
commit
9d097e7d15
20 changed files with 50 additions and 51 deletions
|
@ -278,7 +278,7 @@ impl LoadOrigin for XMLHttpRequest {
|
|||
}
|
||||
fn pipeline_id(&self) -> Option<PipelineId> {
|
||||
let global = self.global();
|
||||
Some(global.r().pipeline())
|
||||
Some(global.r().pipeline_id())
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1189,7 +1189,7 @@ impl XMLHttpRequest {
|
|||
let decoded = charset.decode(&self.response.borrow(), DecoderTrap::Replace).unwrap();
|
||||
let document = self.new_doc(IsHTMLDocument::HTMLDocument);
|
||||
// TODO: Disable scripting while parsing
|
||||
parse_html(document.r(), DOMString::from(decoded), wr.get_url(), ParseContext::Owner(Some(wr.pipeline())));
|
||||
parse_html(document.r(), DOMString::from(decoded), wr.get_url(), ParseContext::Owner(Some(wr.pipeline_id())));
|
||||
document
|
||||
}
|
||||
|
||||
|
@ -1200,7 +1200,10 @@ impl XMLHttpRequest {
|
|||
let decoded = charset.decode(&self.response.borrow(), DecoderTrap::Replace).unwrap();
|
||||
let document = self.new_doc(IsHTMLDocument::NonHTMLDocument);
|
||||
// TODO: Disable scripting while parsing
|
||||
parse_xml(document.r(), DOMString::from(decoded), wr.get_url(), xml::ParseContext::Owner(Some(wr.pipeline())));
|
||||
parse_xml(document.r(),
|
||||
DOMString::from(decoded),
|
||||
wr.get_url(),
|
||||
xml::ParseContext::Owner(Some(wr.pipeline_id())));
|
||||
document
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue