Upgrade to SM 39

1 files changed, 8 insertions, 8 deletions

diff --git a/components/script/dom/textdecoder.rs b/components/script/dom/textdecoder.rs
index 4b3333234a3..308ca30527c 100644
--- a/components/script/dom/textdecoder.rs
+++ b/components/script/dom/textdecoder.rs
@@ -6,7 +6,7 @@ use dom::bindings::codegen::Bindings::TextDecoderBinding;
 use dom::bindings::codegen::Bindings::TextDecoderBinding::TextDecoderMethods;
 use dom::bindings::error::{Error, Fallible};
 use dom::bindings::global::GlobalRef;
-use dom::bindings::js::{JSRef, Temporary};
+use dom::bindings::js::Root;
 use dom::bindings::str::USVString;
 use dom::bindings::trace::JSTraceable;
 use dom::bindings::utils::{Reflector, reflect_dom_object};
@@ -17,7 +17,7 @@ use encoding::Encoding;
 use encoding::types::{EncodingRef, DecoderTrap};
 use encoding::label::encoding_from_whatwg_label;
 use js::jsapi::{JSContext, JSObject};
-use js::jsfriendapi::bindgen::JS_GetObjectAsArrayBufferView;
+use js::jsapi::JS_GetObjectAsArrayBufferView;
 
 use std::borrow::ToOwned;
 use std::ptr;
@@ -39,11 +39,11 @@ impl TextDecoder {
         }
     }
 
-    fn make_range_error() -> Fallible<Temporary<TextDecoder>> {
+    fn make_range_error() -> Fallible<Root<TextDecoder>> {
         Err(Error::Range("The given encoding is not supported.".to_owned()))
     }
 
-    pub fn new(global: GlobalRef, encoding: EncodingRef, fatal: bool) -> Temporary<TextDecoder> {
+    pub fn new(global: GlobalRef, encoding: EncodingRef, fatal: bool) -> Root<TextDecoder> {
         reflect_dom_object(box TextDecoder::new_inherited(encoding, fatal),
                            global,
                            TextDecoderBinding::Wrap)
@@ -53,7 +53,7 @@ impl TextDecoder {
     pub fn Constructor(global: GlobalRef,
                        label: DOMString,
                        options: &TextDecoderBinding::TextDecoderOptions)
-                            -> Fallible<Temporary<TextDecoder>> {
+                            -> Fallible<Root<TextDecoder>> {
         let encoding = match encoding_from_whatwg_label(&label) {
             None => return TextDecoder::make_range_error(),
             Some(enc) => enc
@@ -72,7 +72,7 @@ impl TextDecoder {
 }
 
 
-impl<'a> TextDecoderMethods for JSRef<'a, TextDecoder> {
+impl<'a> TextDecoderMethods for &'a TextDecoder {
     fn Encoding(self) -> DOMString {
         self.encoding.whatwg_name().unwrap().to_owned()
     }
@@ -82,7 +82,7 @@ impl<'a> TextDecoderMethods for JSRef<'a, TextDecoder> {
     }
 
     #[allow(unsafe_code)]
-    fn Decode(self, cx: *mut JSContext, input: Option<*mut JSObject>)
+    fn Decode(self, _cx: *mut JSContext, input: Option<*mut JSObject>)
               -> Fallible<USVString> {
         let input = match input {
             Some(input) => input,
@@ -91,7 +91,7 @@ impl<'a> TextDecoderMethods for JSRef<'a, TextDecoder> {
 
         let mut length = 0;
         let mut data = ptr::null_mut();
-        if unsafe { JS_GetObjectAsArrayBufferView(cx, input, &mut length, &mut data).is_null() } {
+        if unsafe { JS_GetObjectAsArrayBufferView(input, &mut length, &mut data).is_null() } {
             return Err(Error::Type("Argument to TextDecoder.decode is not an ArrayBufferView".to_owned()));
         }