1 files changed, 51 insertions, 35 deletions

diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs
index a97dc7f802b..24ee2c28d36 100644
--- a/components/script/dom/xmlhttprequest.rs
+++ b/components/script/dom/xmlhttprequest.rs
@@ -45,8 +45,8 @@ use js::jsapi::{JSContext, JS_ParseJSON};
 use js::jsapi::JS_ClearPendingException;
 use js::jsval::{JSVal, NullValue, UndefinedValue};
 use msg::constellation_msg::{PipelineId, ReferrerPolicy};
-use net_traits::{CoreResourceThread, LoadOrigin};
-use net_traits::{FetchResponseListener, Metadata, NetworkError};
+use net_traits::{CoreResourceThread, FetchMetadata, FilteredMetadata};
+use net_traits::{FetchResponseListener, LoadOrigin, NetworkError};
 use net_traits::CoreResourceMsg::Fetch;
 use net_traits::request::{CredentialsMode, Destination, RequestInit, RequestMode};
 use net_traits::trim_http_whitespace;
@@ -219,35 +219,39 @@ impl XMLHttpRequest {
                           core_resource_thread: CoreResourceThread,
                           init: RequestInit) {
         impl FetchResponseListener for XHRContext {
-                fn process_request_body(&mut self) {
-                    // todo
-                }
-                fn process_request_eof(&mut self) {
-                    // todo
-                }
-                fn process_response(&mut self, metadata: Result<Metadata, NetworkError>) {
-                    let xhr = self.xhr.root();
-                    let rv = xhr.process_headers_available(self.gen_id,
-                                                           metadata);
-                    if rv.is_err() {
-                        *self.sync_status.borrow_mut() = Some(rv);
-                    }
-                }
-                fn process_response_chunk(&mut self, mut chunk: Vec<u8>) {
-                    self.buf.borrow_mut().append(&mut chunk);
-                    self.xhr.root().process_data_available(self.gen_id, self.buf.borrow().clone());
-                }
-                fn process_response_eof(&mut self, response: Result<(), NetworkError>) {
-                    let rv = match response {
-                        Ok(()) => {
-                            self.xhr.root().process_response_complete(self.gen_id, Ok(()))
-                        }
-                        Err(e) => {
-                            self.xhr.root().process_response_complete(self.gen_id, Err(e))
-                        }
-                    };
+            fn process_request_body(&mut self) {
+                // todo
+            }
+
+            fn process_request_eof(&mut self) {
+                // todo
+            }
+
+            fn process_response(&mut self,
+                                metadata: Result<FetchMetadata, NetworkError>) {
+                let xhr = self.xhr.root();
+                let rv = xhr.process_headers_available(self.gen_id, metadata);
+                if rv.is_err() {
                     *self.sync_status.borrow_mut() = Some(rv);
                 }
+            }
+
+            fn process_response_chunk(&mut self, mut chunk: Vec<u8>) {
+                self.buf.borrow_mut().append(&mut chunk);
+                self.xhr.root().process_data_available(self.gen_id, self.buf.borrow().clone());
+            }
+
+            fn process_response_eof(&mut self, response: Result<(), NetworkError>) {
+                let rv = match response {
+                    Ok(()) => {
+                        self.xhr.root().process_response_complete(self.gen_id, Ok(()))
+                    }
+                    Err(e) => {
+                        self.xhr.root().process_response_complete(self.gen_id, Err(e))
+                    }
+                };
+                *self.sync_status.borrow_mut() = Some(rv);
+            }
         }
 
         impl PreInvoke for XHRContext {
@@ -273,12 +277,14 @@ impl LoadOrigin for XMLHttpRequest {
     fn referrer_url(&self) -> Option<Url> {
         return self.referrer_url.clone();
     }
+
     fn referrer_policy(&self) -> Option<ReferrerPolicy> {
         return self.referrer_policy;
     }
+
     fn pipeline_id(&self) -> Option<PipelineId> {
         let global = self.global();
-        Some(global.r().pipeline())
+        Some(global.r().pipeline_id())
     }
 }
 
@@ -593,9 +599,10 @@ impl XMLHttpRequestMethods for XMLHttpRequest {
             credentials_mode: credentials_mode,
             use_url_credentials: use_url_credentials,
             origin: self.global().r().get_url(),
-            referer_url: self.referrer_url.clone(),
+            referrer_url: self.referrer_url.clone(),
             referrer_policy: self.referrer_policy.clone(),
             pipeline_id: self.pipeline_id(),
+            .. RequestInit::default()
         };
 
         if bypass_cross_origin_check {
@@ -862,10 +869,16 @@ impl XMLHttpRequest {
     }
 
     fn process_headers_available(&self,
-                                 gen_id: GenerationId, metadata: Result<Metadata, NetworkError>)
+                                 gen_id: GenerationId, metadata: Result<FetchMetadata, NetworkError>)
                                  -> Result<(), Error> {
         let metadata = match metadata {
-            Ok(meta) => meta,
+            Ok(meta) => match meta {
+                FetchMetadata::Unfiltered(m) => m,
+                FetchMetadata::Filtered { filtered, .. } => match filtered {
+                    FilteredMetadata::Opaque => return Err(Error::Network),
+                    FilteredMetadata::Transparent(m) => m
+                }
+            },
             Err(_) => {
                 self.process_partial_response(XHRProgress::Errored(gen_id, Error::Network));
                 return Err(Error::Network);
@@ -1189,7 +1202,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 +1213,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
     }