From ffdc3f5b32a345b88eed774848924e862d47c093 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Fri, 28 Mar 2014 10:17:56 -0400
Subject: Turn on GC all the time. Fix rooting errors during parsing and
 storing timers. Fix borrow errors during tracing.

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

(limited to 'src/components/script/dom/xmlhttprequestupload.rs')

diff --git a/src/components/script/dom/xmlhttprequestupload.rs b/src/components/script/dom/xmlhttprequestupload.rs
index bcfb2d02c47..5e06d51b1d3 100644
--- a/src/components/script/dom/xmlhttprequestupload.rs
+++ b/src/components/script/dom/xmlhttprequestupload.rs
@@ -4,7 +4,7 @@
 
 use dom::bindings::codegen::InheritTypes::XMLHttpRequestUploadDerived;
 use dom::bindings::codegen::BindingDeclarations::XMLHttpRequestUploadBinding;
-use dom::bindings::js::JS;
+use dom::bindings::js::{JS, JSRef};
 use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object};
 use dom::eventtarget::{EventTarget, XMLHttpRequestTargetTypeId};
 use dom::window::Window;
@@ -22,7 +22,7 @@ impl XMLHttpRequestUpload {
             eventtarget:XMLHttpRequestEventTarget::new_inherited(XMLHttpRequestUploadTypeId)
         }
     }
-    pub fn new(window: &JS<Window>) -> JS<XMLHttpRequestUpload> {
+    pub fn new(window: &JSRef<Window>) -> JS<XMLHttpRequestUpload> {
         reflect_dom_object(~XMLHttpRequestUpload::new_inherited(),
                            window,
                            XMLHttpRequestUploadBinding::Wrap)
-- 
cgit v1.2.3


From d7b96db33ca8f2b8a162df38e0f00e95f5ea6fa1 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Mon, 31 Mar 2014 18:41:28 -0400
Subject: Implement safe rooting strategy via Unrooted, Root, JSRef, and JS.

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

(limited to 'src/components/script/dom/xmlhttprequestupload.rs')

diff --git a/src/components/script/dom/xmlhttprequestupload.rs b/src/components/script/dom/xmlhttprequestupload.rs
index 5e06d51b1d3..8e251dd4e8f 100644
--- a/src/components/script/dom/xmlhttprequestupload.rs
+++ b/src/components/script/dom/xmlhttprequestupload.rs
@@ -4,7 +4,7 @@
 
 use dom::bindings::codegen::InheritTypes::XMLHttpRequestUploadDerived;
 use dom::bindings::codegen::BindingDeclarations::XMLHttpRequestUploadBinding;
-use dom::bindings::js::{JS, JSRef};
+use dom::bindings::js::{Unrooted, JSRef};
 use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object};
 use dom::eventtarget::{EventTarget, XMLHttpRequestTargetTypeId};
 use dom::window::Window;
@@ -22,7 +22,7 @@ impl XMLHttpRequestUpload {
             eventtarget:XMLHttpRequestEventTarget::new_inherited(XMLHttpRequestUploadTypeId)
         }
     }
-    pub fn new(window: &JSRef<Window>) -> JS<XMLHttpRequestUpload> {
+    pub fn new(window: &JSRef<Window>) -> Unrooted<XMLHttpRequestUpload> {
         reflect_dom_object(~XMLHttpRequestUpload::new_inherited(),
                            window,
                            XMLHttpRequestUploadBinding::Wrap)
-- 
cgit v1.2.3


From 76783b029e5e10da7fd61ab356a8f80a1eaf32e0 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Thu, 10 Apr 2014 21:29:54 -0400
Subject: Move WebIDL methods to traits implemented by JSRef types.

---
 src/components/script/dom/xmlhttprequestupload.rs | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/components/script/dom/xmlhttprequestupload.rs')

diff --git a/src/components/script/dom/xmlhttprequestupload.rs b/src/components/script/dom/xmlhttprequestupload.rs
index 8e251dd4e8f..c2332d84ee0 100644
--- a/src/components/script/dom/xmlhttprequestupload.rs
+++ b/src/components/script/dom/xmlhttprequestupload.rs
@@ -45,4 +45,7 @@ impl XMLHttpRequestUploadDerived for EventTarget {
             _ => false
         }
     }
+}
+
+pub trait XMLHttpRequestUploadMethods {
 }
\ No newline at end of file
-- 
cgit v1.2.3


From 522d3f167b12fa79401eea5525c7b6133cae0f06 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Thu, 17 Apr 2014 17:08:00 -0400
Subject: s/Unrooted/Temporary/g

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

(limited to 'src/components/script/dom/xmlhttprequestupload.rs')

diff --git a/src/components/script/dom/xmlhttprequestupload.rs b/src/components/script/dom/xmlhttprequestupload.rs
index c2332d84ee0..6f373ab0a65 100644
--- a/src/components/script/dom/xmlhttprequestupload.rs
+++ b/src/components/script/dom/xmlhttprequestupload.rs
@@ -4,7 +4,7 @@
 
 use dom::bindings::codegen::InheritTypes::XMLHttpRequestUploadDerived;
 use dom::bindings::codegen::BindingDeclarations::XMLHttpRequestUploadBinding;
-use dom::bindings::js::{Unrooted, JSRef};
+use dom::bindings::js::{Temporary, JSRef};
 use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object};
 use dom::eventtarget::{EventTarget, XMLHttpRequestTargetTypeId};
 use dom::window::Window;
@@ -22,7 +22,7 @@ impl XMLHttpRequestUpload {
             eventtarget:XMLHttpRequestEventTarget::new_inherited(XMLHttpRequestUploadTypeId)
         }
     }
-    pub fn new(window: &JSRef<Window>) -> Unrooted<XMLHttpRequestUpload> {
+    pub fn new(window: &JSRef<Window>) -> Temporary<XMLHttpRequestUpload> {
         reflect_dom_object(~XMLHttpRequestUpload::new_inherited(),
                            window,
                            XMLHttpRequestUploadBinding::Wrap)
-- 
cgit v1.2.3