From f963ed99ac6b31b15da8c58cf45f142f93d001f1 Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Tue, 15 Jul 2014 12:09:21 +0200
Subject: Rename variables that refer to global objects.

This clarifies whether those variables will point to a Window object or an
arbitrary global object.

Note in particular that all IDL Constructors will accept an arbitrary global
object.
---
 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 9c5b3854eab..e4d26c7f017 100644
--- a/src/components/script/dom/xmlhttprequestupload.rs
+++ b/src/components/script/dom/xmlhttprequestupload.rs
@@ -22,9 +22,9 @@ impl XMLHttpRequestUpload {
             eventtarget:XMLHttpRequestEventTarget::new_inherited(XMLHttpRequestUploadTypeId)
         }
     }
-    pub fn new(window: &JSRef<Window>) -> Temporary<XMLHttpRequestUpload> {
+    pub fn new(global: &JSRef<Window>) -> Temporary<XMLHttpRequestUpload> {
         reflect_dom_object(box XMLHttpRequestUpload::new_inherited(),
-                           window,
+                           global,
                            XMLHttpRequestUploadBinding::Wrap)
     }
 }
-- 
cgit v1.2.3


From 829259fb794831167c9992bd6b1c71bf81bd8023 Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Tue, 15 Jul 2014 13:30:19 +0200
Subject: Introduce abstractions for global scopes.

Part of #2811.
---
 src/components/script/dom/xmlhttprequestupload.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 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 e4d26c7f017..cf444d6c70b 100644
--- a/src/components/script/dom/xmlhttprequestupload.rs
+++ b/src/components/script/dom/xmlhttprequestupload.rs
@@ -4,10 +4,10 @@
 
 use dom::bindings::codegen::InheritTypes::XMLHttpRequestUploadDerived;
 use dom::bindings::codegen::Bindings::XMLHttpRequestUploadBinding;
-use dom::bindings::js::{Temporary, JSRef};
+use dom::bindings::global::GlobalRef;
+use dom::bindings::js::Temporary;
 use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object};
 use dom::eventtarget::{EventTarget, XMLHttpRequestTargetTypeId};
-use dom::window::Window;
 use dom::xmlhttprequest::{XMLHttpRequestUploadTypeId};
 use dom::xmlhttprequesteventtarget::XMLHttpRequestEventTarget;
 
@@ -22,7 +22,7 @@ impl XMLHttpRequestUpload {
             eventtarget:XMLHttpRequestEventTarget::new_inherited(XMLHttpRequestUploadTypeId)
         }
     }
-    pub fn new(global: &JSRef<Window>) -> Temporary<XMLHttpRequestUpload> {
+    pub fn new(global: &GlobalRef) -> Temporary<XMLHttpRequestUpload> {
         reflect_dom_object(box XMLHttpRequestUpload::new_inherited(),
                            global,
                            XMLHttpRequestUploadBinding::Wrap)
-- 
cgit v1.2.3