Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 13:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use DOMRefCell for XMLHttpRequest.

Browse source
This commit is contained in:
Tetsuharu OHZEKI 2014-10-21 02:17:32 +09:00
parent 6d089a87d5
commit 71b4143d32
1 changed files with 18 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,6 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use dom::bindings::cell::DOMRefCell;
use dom::bindings::codegen::Bindings::EventHandlerBinding::EventHandlerNonNull; use dom::bindings::codegen::Bindings::EventHandlerBinding::EventHandlerNonNull;
use dom::bindings::codegen::Bindings::XMLHttpRequestBinding; use dom::bindings::codegen::Bindings::XMLHttpRequestBinding;
use dom::bindings::codegen::Bindings::XMLHttpRequestBinding::XMLHttpRequestMethods; use dom::bindings::codegen::Bindings::XMLHttpRequestBinding::XMLHttpRequestMethods;
@ -50,7 +51,7 @@ use servo_util::str::DOMString;
use servo_util::task::spawn_named; use servo_util::task::spawn_named;
use std::ascii::StrAsciiExt; use std::ascii::StrAsciiExt;
use std::cell::{Cell, RefCell}; use std::cell::Cell;
use std::comm::{Sender, Receiver, channel}; use std::comm::{Sender, Receiver, channel};
use std::default::Default; use std::default::Default;
use std::io::{BufReader, MemWriter, Timer}; use std::io::{BufReader, MemWriter, Timer};
@ -111,16 +112,16 @@ pub struct XMLHttpRequest {
upload: JS<XMLHttpRequestUpload>, upload: JS<XMLHttpRequestUpload>,
response_url: DOMString, response_url: DOMString,
status: Cell<u16>, status: Cell<u16>,
status_text: RefCell<ByteString>, status_text: DOMRefCell<ByteString>,
response: RefCell<ByteString>, response: DOMRefCell<ByteString>,
response_type: Cell<XMLHttpRequestResponseType>, response_type: Cell<XMLHttpRequestResponseType>,
response_xml: MutNullableJS<Document>, response_xml: MutNullableJS<Document>,
response_headers: RefCell<ResponseHeaderCollection>, response_headers: DOMRefCell<ResponseHeaderCollection>,
// Associated concepts // Associated concepts
request_method: RefCell<Method>, request_method: DOMRefCell<Method>,
request_url: RefCell<Option<Url>>, request_url: DOMRefCell<Option<Url>>,
request_headers: RefCell<RequestHeaderCollection>, request_headers: DOMRefCell<RequestHeaderCollection>,
request_body_len: Cell<uint>, request_body_len: Cell<uint>,
sync: Cell<bool>, sync: Cell<bool>,
upload_complete: Cell<bool>, upload_complete: Cell<bool>,
@ -129,10 +130,10 @@ pub struct XMLHttpRequest {
global: GlobalField, global: GlobalField,
pinned_count: Cell<uint>, pinned_count: Cell<uint>,
timer: RefCell<Timer>, timer: DOMRefCell<Timer>,
fetch_time: Cell<i64>, fetch_time: Cell<i64>,
timeout_pinned: Cell<bool>, timeout_pinned: Cell<bool>,
terminate_sender: RefCell<Option<Sender<Error>>>, terminate_sender: DOMRefCell<Option<Sender<Error>>>,
} }
impl XMLHttpRequest { impl XMLHttpRequest {
@ -145,15 +146,15 @@ impl XMLHttpRequest {
upload: JS::from_rooted(XMLHttpRequestUpload::new(global)), upload: JS::from_rooted(XMLHttpRequestUpload::new(global)),
response_url: "".to_string(), response_url: "".to_string(),
status: Cell::new(0), status: Cell::new(0),
status_text: RefCell::new(ByteString::new(vec!())), status_text: DOMRefCell::new(ByteString::new(vec!())),
response: RefCell::new(ByteString::new(vec!())), response: DOMRefCell::new(ByteString::new(vec!())),
response_type: Cell::new(_empty), response_type: Cell::new(_empty),
response_xml: Default::default(), response_xml: Default::default(),
response_headers: RefCell::new(ResponseHeaderCollection::new()), response_headers: DOMRefCell::new(ResponseHeaderCollection::new()),
request_method: RefCell::new(Get), request_method: DOMRefCell::new(Get),
request_url: RefCell::new(None), request_url: DOMRefCell::new(None),
request_headers: RefCell::new(RequestHeaderCollection::new()), request_headers: DOMRefCell::new(RequestHeaderCollection::new()),
request_body_len: Cell::new(0), request_body_len: Cell::new(0),
sync: Cell::new(false), sync: Cell::new(false),
send_flag: Cell::new(false), send_flag: Cell::new(false),
@ -163,10 +164,10 @@ impl XMLHttpRequest {
global: GlobalField::from_rooted(global), global: GlobalField::from_rooted(global),
pinned_count: Cell::new(0), pinned_count: Cell::new(0),
timer: RefCell::new(Timer::new().unwrap()), timer: DOMRefCell::new(Timer::new().unwrap()),
fetch_time: Cell::new(0), fetch_time: Cell::new(0),
timeout_pinned: Cell::new(false), timeout_pinned: Cell::new(false),
terminate_sender: RefCell::new(None), terminate_sender: DOMRefCell::new(None),
} }
} }
pub fn new(global: &GlobalRef) -> Temporary<XMLHttpRequest> { pub fn new(global: &GlobalRef) -> Temporary<XMLHttpRequest> {