auto merge of #5511 : Ms2ger/servo/int, r=jdm

This commit is contained in:
bors-servo 2015-04-03 13:54:46 -06:00
commit 036b3eaa04
12 changed files with 23 additions and 24 deletions

View file

@ -94,7 +94,7 @@ impl Runnable for XHRProgressHandler {
#[derive(PartialEq, Clone, Copy)]
#[jstraceable]
pub struct GenerationId(uint);
pub struct GenerationId(u32);
#[derive(Clone)]
pub enum XHRProgress {
@ -148,7 +148,7 @@ pub struct XMLHttpRequest {
request_method: DOMRefCell<Method>,
request_url: DOMRefCell<Option<Url>>,
request_headers: DOMRefCell<Headers>,
request_body_len: Cell<uint>,
request_body_len: Cell<usize>,
sync: Cell<bool>,
upload_complete: Cell<bool>,
upload_events: Cell<bool>,