diff options
Diffstat (limited to 'components/script/dom/xmlhttprequest.rs')
-rw-r--r-- | components/script/dom/xmlhttprequest.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs index af424fb83d7..1e95250149d 100644 --- a/components/script/dom/xmlhttprequest.rs +++ b/components/script/dom/xmlhttprequest.rs @@ -40,7 +40,7 @@ use hyper::mime::{self, Mime, Attr as MimeAttr, Value as MimeValue}; use ipc_channel::ipc; use ipc_channel::router::ROUTER; use js::jsapi::JS_ClearPendingException; -use js::jsapi::{JSContext, JS_ParseJSON, RootedValue}; +use js::jsapi::{JSContext, JS_ParseJSON}; use js::jsval::{JSVal, NullValue, UndefinedValue}; use msg::constellation_msg::{PipelineId, ReferrerPolicy}; use net_traits::CoreResourceMsg::Fetch; @@ -772,7 +772,7 @@ impl XMLHttpRequestMethods for XMLHttpRequest { // https://xhr.spec.whatwg.org/#the-response-attribute fn Response(&self, cx: *mut JSContext) -> JSVal { unsafe { - let mut rval = RootedValue::new(cx, UndefinedValue()); + rooted!(in(cx) let mut rval = UndefinedValue()); match self.response_type.get() { XMLHttpRequestResponseType::_empty | XMLHttpRequestResponseType::Text => { let ready_state = self.ready_state.get(); @@ -809,7 +809,7 @@ impl XMLHttpRequestMethods for XMLHttpRequest { self.response.borrow().to_jsval(cx, rval.handle_mut()); } } - rval.ptr + rval.get() } } @@ -1177,7 +1177,7 @@ impl XMLHttpRequest { let json_text = UTF_8.decode(&bytes, DecoderTrap::Replace).unwrap(); let json_text: Vec<u16> = json_text.encode_utf16().collect(); // Step 5 - let mut rval = RootedValue::new(cx, UndefinedValue()); + rooted!(in(cx) let mut rval = UndefinedValue()); unsafe { if !JS_ParseJSON(cx, json_text.as_ptr(), @@ -1188,7 +1188,7 @@ impl XMLHttpRequest { } } // Step 6 - self.response_json.set(rval.ptr); + self.response_json.set(rval.get()); self.response_json.get() } |