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.

1 files changed, 6 insertions, 3 deletions

diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs
index a97dc7f802b..c23b97b48d7 100644
--- a/components/script/dom/xmlhttprequest.rs
+++ b/components/script/dom/xmlhttprequest.rs
@@ -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
     }