From 6dc42dd1d6979cea7059b055de7f0d6f93c14338 Mon Sep 17 00:00:00 2001
From: Anthony Ramine <n.oxyde@gmail.com>
Date: Sat, 17 Oct 2015 16:46:32 +0200
Subject: [PATCH] Do not root XMLHttpRequest::upload

---
 components/script/dom/xmlhttprequest.rs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs
index 3373865fa5f..400b06ca95f 100644
--- a/components/script/dom/xmlhttprequest.rs
+++ b/components/script/dom/xmlhttprequest.rs
@@ -493,8 +493,7 @@ impl XMLHttpRequestMethods for XMLHttpRequest {
 
         if !self.sync.get() {
             // Step 8
-            let upload_target = self.upload.root();
-            let event_target = EventTargetCast::from_ref(upload_target.r());
+            let event_target = EventTargetCast::from_ref(&*self.upload);
             if event_target.has_handlers() {
                 self.upload_events.set(true);
             }
@@ -917,13 +916,12 @@ impl XMLHttpRequest {
 
     fn dispatch_progress_event(&self, upload: bool, type_: DOMString, loaded: u64, total: Option<u64>) {
         let global = self.global.root();
-        let upload_target = self.upload.root();
         let progressevent = ProgressEvent::new(global.r(),
                                                type_, EventBubbles::DoesNotBubble, EventCancelable::NotCancelable,
                                                total.is_some(), loaded,
                                                total.unwrap_or(0));
         let target = if upload {
-            EventTargetCast::from_ref(upload_target.r())
+            EventTargetCast::from_ref(&*self.upload)
         } else {
             EventTargetCast::from_ref(self)
         };