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

auto merge of #2655 : Ms2ger/servo/warnings, r=jdm

Browse source
This commit is contained in:
bors-servo 2014-06-13 18:49:47 -04:00
commit dae6ad409d
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/script/dom/node.rs
View file

@ -1241,7 +1241,7 @@ impl Node {
clone_children: CloneChildrenFlag) -> Temporary<Node> { clone_children: CloneChildrenFlag) -> Temporary<Node> {
// Step 1. // Step 1.
let mut document = match maybe_doc { let document = match maybe_doc {
Some(doc) => JS::from_rooted(doc).root(), Some(doc) => JS::from_rooted(doc).root(),
None => node.owner_doc().root() None => node.owner_doc().root()
}; };

2
src/components/script/dom/xmlhttprequest.rs
View file

@ -734,7 +734,7 @@ impl<'a> PrivateXMLHttpRequestHelpers for JSRef<'a, XMLHttpRequest> {
fn dispatch_progress_event(&self, upload: bool, type_: DOMString, loaded: u64, total: Option<u64>) { fn dispatch_progress_event(&self, upload: bool, type_: DOMString, loaded: u64, total: Option<u64>) {
let win = &*self.global.root(); let win = &*self.global.root();
let upload_target = &*self.upload.get().root(); let upload_target = &*self.upload.get().root();
let mut progressevent = ProgressEvent::new(win, type_, false, false, let progressevent = ProgressEvent::new(win, type_, false, false,
total.is_some(), loaded, total.is_some(), loaded,
total.unwrap_or(0)).root(); total.unwrap_or(0)).root();
let target: &JSRef<EventTarget> = if upload { let target: &JSRef<EventTarget> = if upload {