Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-19 14:48:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove global field from XMLHttpRequest

Browse source
This commit is contained in:
Chad Kimes 2016-01-10 22:34:44 -05:00
parent 9b79f2f5a3
commit 9371c041a3
1 changed files with 15 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -16,7 +16,7 @@ use dom::bindings::codegen::UnionTypes::StringOrURLSearchParams;
use dom::bindings::codegen::UnionTypes::StringOrURLSearchParams::{eString, eURLSearchParams}; use dom::bindings::codegen::UnionTypes::StringOrURLSearchParams::{eString, eURLSearchParams};
use dom::bindings::conversions::{ToJSValConvertible}; use dom::bindings::conversions::{ToJSValConvertible};
use dom::bindings::error::{Error, ErrorResult, Fallible}; use dom::bindings::error::{Error, ErrorResult, Fallible};
use dom::bindings::global::{GlobalField, GlobalRef, GlobalRoot}; use dom::bindings::global::{GlobalRef, GlobalRoot, global_root_from_reflector};
use dom::bindings::inheritance::Castable; use dom::bindings::inheritance::Castable;
use dom::bindings::js::{JS, MutNullableHeap}; use dom::bindings::js::{JS, MutNullableHeap};
use dom::bindings::js::{Root, RootedReference}; use dom::bindings::js::{Root, RootedReference};
@ -141,7 +141,6 @@ pub struct XMLHttpRequest {
upload_events: Cell<bool>, upload_events: Cell<bool>,
send_flag: Cell<bool>, send_flag: Cell<bool>,
global: GlobalField,
timeout_cancel: DOMRefCell<Option<TimerHandle>>, timeout_cancel: DOMRefCell<Option<TimerHandle>>,
fetch_time: Cell<i64>, fetch_time: Cell<i64>,
generation_id: Cell<GenerationId>, generation_id: Cell<GenerationId>,
@ -175,7 +174,6 @@ impl XMLHttpRequest {
upload_events: Cell::new(false), upload_events: Cell::new(false),
send_flag: Cell::new(false), send_flag: Cell::new(false),
global: GlobalField::from_rooted(&global),
timeout_cancel: DOMRefCell::new(None), timeout_cancel: DOMRefCell::new(None),
fetch_time: Cell::new(0), fetch_time: Cell::new(0),
generation_id: Cell::new(GenerationId(0)), generation_id: Cell::new(GenerationId(0)),
@ -325,7 +323,7 @@ impl XMLHttpRequestMethods for XMLHttpRequest {
*self.request_method.borrow_mut() = parsed_method; *self.request_method.borrow_mut() = parsed_method;
// Step 6 // Step 6
let base = self.global.root().r().get_url(); let base = global_root_from_reflector(self).r().get_url();
let parsed_url = match base.join(&url) { let parsed_url = match base.join(&url) {
Ok(parsed) => parsed, Ok(parsed) => parsed,
Err(_) => return Err(Error::Syntax) // Step 7 Err(_) => return Err(Error::Syntax) // Step 7
@ -457,7 +455,7 @@ impl XMLHttpRequestMethods for XMLHttpRequest {
XMLHttpRequestState::Loading | XMLHttpRequestState::Loading |
XMLHttpRequestState::Done => Err(Error::InvalidState), XMLHttpRequestState::Done => Err(Error::InvalidState),
_ if self.send_flag.get() => Err(Error::InvalidState), _ if self.send_flag.get() => Err(Error::InvalidState),
_ => match self.global.root() { _ => match global_root_from_reflector(self) {
GlobalRoot::Window(_) if self.sync.get() => Err(Error::InvalidAccess), GlobalRoot::Window(_) if self.sync.get() => Err(Error::InvalidAccess),
_ => { _ => {
self.with_credentials.set(with_credentials); self.with_credentials.set(with_credentials);
@ -519,7 +517,7 @@ impl XMLHttpRequestMethods for XMLHttpRequest {
} }
let global = self.global.root(); let global = global_root_from_reflector(self);
let pipeline_id = global.r().pipeline(); let pipeline_id = global.r().pipeline();
let mut load_data = let mut load_data =
LoadData::new(LoadContext::Browsing, LoadData::new(LoadContext::Browsing,
@ -562,8 +560,8 @@ impl XMLHttpRequestMethods for XMLHttpRequest {
load_data.method = (*self.request_method.borrow()).clone(); load_data.method = (*self.request_method.borrow()).clone();
// CORS stuff // CORS stuff
let global = self.global.root(); let global = global_root_from_reflector(self);
let referer_url = self.global.root().r().get_url(); let referer_url = global_root_from_reflector(self).r().get_url();
let mode = if self.upload_events.get() { let mode = if self.upload_events.get() {
RequestMode::ForcedPreflight RequestMode::ForcedPreflight
} else { } else {
@ -686,7 +684,7 @@ impl XMLHttpRequestMethods for XMLHttpRequest {
// https://xhr.spec.whatwg.org/#the-responsetype-attribute // https://xhr.spec.whatwg.org/#the-responsetype-attribute
fn SetResponseType(&self, response_type: XMLHttpRequestResponseType) -> ErrorResult { fn SetResponseType(&self, response_type: XMLHttpRequestResponseType) -> ErrorResult {
match self.global.root() { match global_root_from_reflector(self) {
GlobalRoot::Worker(_) if response_type == XMLHttpRequestResponseType::Document GlobalRoot::Worker(_) if response_type == XMLHttpRequestResponseType::Document
=> return Ok(()), => return Ok(()),
_ => {} _ => {}
@ -789,7 +787,7 @@ impl XMLHttpRequest {
fn change_ready_state(&self, rs: XMLHttpRequestState) { fn change_ready_state(&self, rs: XMLHttpRequestState) {
assert!(self.ready_state.get() != rs); assert!(self.ready_state.get() != rs);
self.ready_state.set(rs); self.ready_state.set(rs);
let global = self.global.root(); let global = global_root_from_reflector(self);
let event = Event::new(global.r(), let event = Event::new(global.r(),
atom!("readystatechange"), atom!("readystatechange"),
EventBubbles::DoesNotBubble, EventBubbles::DoesNotBubble,
@ -970,7 +968,7 @@ impl XMLHttpRequest {
} }
fn dispatch_progress_event(&self, upload: bool, type_: Atom, loaded: u64, total: Option<u64>) { fn dispatch_progress_event(&self, upload: bool, type_: Atom, loaded: u64, total: Option<u64>) {
let global = self.global.root(); let global = global_root_from_reflector(self);
let progressevent = ProgressEvent::new(global.r(), let progressevent = ProgressEvent::new(global.r(),
type_, type_,
EventBubbles::DoesNotBubble, EventBubbles::DoesNotBubble,
@ -1024,7 +1022,7 @@ impl XMLHttpRequest {
// Sets up the object to timeout in a given number of milliseconds // Sets up the object to timeout in a given number of milliseconds
// This will cancel all previous timeouts // This will cancel all previous timeouts
let global = self.global.root(); let global = global_root_from_reflector(self);
let callback = ScheduledXHRTimeout { let callback = ScheduledXHRTimeout {
xhr: Trusted::new(self, global.r().networking_thread_source()), xhr: Trusted::new(self, global.r().networking_thread_source()),
generation_id: self.generation_id.get(), generation_id: self.generation_id.get(),
@ -1035,7 +1033,7 @@ impl XMLHttpRequest {
fn cancel_timeout(&self) { fn cancel_timeout(&self) {
if let Some(handle) = self.timeout_cancel.borrow_mut().take() { if let Some(handle) = self.timeout_cancel.borrow_mut().take() {
let global = self.global.root(); let global = global_root_from_reflector(self);
global.r().unschedule_callback(handle); global.r().unschedule_callback(handle);
} }
} }
@ -1084,7 +1082,7 @@ impl XMLHttpRequest {
fn document_text_html(&self) -> Root<Document>{ fn document_text_html(&self) -> Root<Document>{
let charset = self.final_charset().unwrap_or(UTF_8); let charset = self.final_charset().unwrap_or(UTF_8);
let wr = self.global.root(); let wr = global_root_from_reflector(self);
let wr = wr.r(); let wr = wr.r();
let decoded = charset.decode(&self.response.borrow(), DecoderTrap::Replace).unwrap().to_owned(); let decoded = charset.decode(&self.response.borrow(), DecoderTrap::Replace).unwrap().to_owned();
let document = self.new_doc(IsHTMLDocument::HTMLDocument); let document = self.new_doc(IsHTMLDocument::HTMLDocument);
@ -1095,7 +1093,7 @@ impl XMLHttpRequest {
fn handle_xml(&self) -> Root<Document> { fn handle_xml(&self) -> Root<Document> {
let charset = self.final_charset().unwrap_or(UTF_8); let charset = self.final_charset().unwrap_or(UTF_8);
let wr = self.global.root(); let wr = global_root_from_reflector(self);
let wr = wr.r(); let wr = wr.r();
let decoded = charset.decode(&self.response.borrow(), DecoderTrap::Replace).unwrap().to_owned(); let decoded = charset.decode(&self.response.borrow(), DecoderTrap::Replace).unwrap().to_owned();
let document = self.new_doc(IsHTMLDocument::NonHTMLDocument); let document = self.new_doc(IsHTMLDocument::NonHTMLDocument);
@ -1105,13 +1103,13 @@ impl XMLHttpRequest {
} }
fn new_doc(&self, is_html_document: IsHTMLDocument) -> Root<Document> { fn new_doc(&self, is_html_document: IsHTMLDocument) -> Root<Document> {
let wr = self.global.root(); let wr = global_root_from_reflector(self);
let wr = wr.r(); let wr = wr.r();
let win = wr.as_window(); let win = wr.as_window();
let doc = win.Document(); let doc = win.Document();
let doc = doc.r(); let doc = doc.r();
let docloader = DocumentLoader::new(&*doc.loader()); let docloader = DocumentLoader::new(&*doc.loader());
let base = self.global.root().r().get_url(); let base = global_root_from_reflector(self).r().get_url();
let parsed_url = match base.join(&self.ResponseURL()) { let parsed_url = match base.join(&self.ResponseURL()) {
Ok(parsed) => Some(parsed), Ok(parsed) => Some(parsed),
Err(_) => None // Step 7 Err(_) => None // Step 7