Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-17 21:04:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make XMLHttpRequest::new take a &GlobalScope

Browse source
This commit is contained in:
Anthony Ramine 2016-10-01 21:32:13 +02:00
parent 22252605af
commit e036579ea0
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
components/script/dom/xmlhttprequest.rs
View file

@ -25,9 +25,11 @@ use dom::document::{Document, IsHTMLDocument};
use dom::document::DocumentSource; use dom::document::DocumentSource;
use dom::event::{Event, EventBubbles, EventCancelable}; use dom::event::{Event, EventBubbles, EventCancelable};
use dom::eventtarget::EventTarget; use dom::eventtarget::EventTarget;
use dom::globalscope::GlobalScope;
use dom::headers::is_forbidden_header_name; use dom::headers::is_forbidden_header_name;
use dom::htmlformelement::{encode_multipart_form_data, generate_boundary}; use dom::htmlformelement::{encode_multipart_form_data, generate_boundary};
use dom::progressevent::ProgressEvent; use dom::progressevent::ProgressEvent;
use dom::window::Window;
use dom::xmlhttprequesteventtarget::XMLHttpRequestEventTarget; use dom::xmlhttprequesteventtarget::XMLHttpRequestEventTarget;
use dom::xmlhttprequestupload::XMLHttpRequestUpload; use dom::xmlhttprequestupload::XMLHttpRequestUpload;
use encoding::all::UTF_8; use encoding::all::UTF_8;
@ -153,9 +155,9 @@ pub struct XMLHttpRequest {
} }
impl XMLHttpRequest { impl XMLHttpRequest {
fn new_inherited(global: GlobalRef) -> XMLHttpRequest { fn new_inherited(global: &GlobalScope) -> XMLHttpRequest {
//TODO - update this when referrer policy implemented for workers //TODO - update this when referrer policy implemented for workers
let (referrer_url, referrer_policy) = if let GlobalRef::Window(window) = global { let (referrer_url, referrer_policy) = if let Some(window) = global.downcast::<Window>() {
let document = window.Document(); let document = window.Document();
(Some(document.url().clone()), document.get_referrer_policy()) (Some(document.url().clone()), document.get_referrer_policy())
} else { } else {
@ -167,7 +169,7 @@ impl XMLHttpRequest {
ready_state: Cell::new(XMLHttpRequestState::Unsent), ready_state: Cell::new(XMLHttpRequestState::Unsent),
timeout: Cell::new(0u32), timeout: Cell::new(0u32),
with_credentials: Cell::new(false), with_credentials: Cell::new(false),
upload: JS::from_ref(&*XMLHttpRequestUpload::new(global.as_global_scope())), upload: JS::from_ref(&*XMLHttpRequestUpload::new(global)),
response_url: DOMRefCell::new(String::from("")), response_url: DOMRefCell::new(String::from("")),
status: Cell::new(0), status: Cell::new(0),
status_text: DOMRefCell::new(ByteString::new(vec!())), status_text: DOMRefCell::new(ByteString::new(vec!())),
@ -196,15 +198,15 @@ impl XMLHttpRequest {
referrer_policy: referrer_policy, referrer_policy: referrer_policy,
} }
} }
pub fn new(global: GlobalRef) -> Root<XMLHttpRequest> { pub fn new(global: &GlobalScope) -> Root<XMLHttpRequest> {
reflect_dom_object(box XMLHttpRequest::new_inherited(global), reflect_dom_object(box XMLHttpRequest::new_inherited(global),
global.as_global_scope(), global,
XMLHttpRequestBinding::Wrap) XMLHttpRequestBinding::Wrap)
} }
// https://xhr.spec.whatwg.org/#constructors // https://xhr.spec.whatwg.org/#constructors
pub fn Constructor(global: GlobalRef) -> Fallible<Root<XMLHttpRequest>> { pub fn Constructor(global: GlobalRef) -> Fallible<Root<XMLHttpRequest>> {
Ok(XMLHttpRequest::new(global)) Ok(XMLHttpRequest::new(global.as_global_scope()))
} }
fn sync_in_window(&self) -> bool { fn sync_in_window(&self) -> bool {