aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/fetch.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2019-05-10 23:51:12 -0400
committerGitHub <noreply@github.com>2019-05-10 23:51:12 -0400
commitd9559499b22bb4724f9b6108919f8d24bdbc83d9 (patch)
tree692e26002cd8afe36e8ab6679d929be11e58a0af /components/script/fetch.rs
parent887f43b65bacad5490365f14d54bf25af4d3234b (diff)
parent7c1c1d9af4735ae86968d65d78b981b7c14585f3 (diff)
downloadservo-d9559499b22bb4724f9b6108919f8d24bdbc83d9.tar.gz
servo-d9559499b22bb4724f9b6108919f8d24bdbc83d9.zip
Auto merge of #23163 - jdm:smup66, r=asajeffrey
Upgrade to SpiderMonkey 66 <!-- Reviewable:start --> This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23163) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/fetch.rs')
-rw-r--r--components/script/fetch.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/components/script/fetch.rs b/components/script/fetch.rs
index d65b79291c5..8f0319f4443 100644
--- a/components/script/fetch.rs
+++ b/components/script/fetch.rs
@@ -26,7 +26,7 @@ use crate::network_listener::{
use crate::task_source::TaskSourceName;
use ipc_channel::ipc;
use ipc_channel::router::ROUTER;
-use js::jsapi::JSAutoCompartment;
+use js::jsapi::JSAutoRealm;
use net_traits::request::RequestBuilder;
use net_traits::request::{Request as NetTraitsRequest, ServiceWorkersMode};
use net_traits::CoreResourceMsg::Fetch as NetTraitsFetch;
@@ -210,10 +210,10 @@ impl FetchResponseListener for FetchContext {
.expect("fetch promise is missing")
.root();
- // JSAutoCompartment needs to be manually made.
+ // JSAutoRealm needs to be manually made.
// Otherwise, Servo will crash.
let promise_cx = promise.global().get_cx();
- let _ac = JSAutoCompartment::new(promise_cx, promise.reflector().get_jsobject().get());
+ let _ac = JSAutoRealm::new(promise_cx, promise.reflector().get_jsobject().get());
match fetch_metadata {
// Step 4.1
Err(_) => {
@@ -263,7 +263,7 @@ impl FetchResponseListener for FetchContext {
let response = self.response_object.root();
let global = response.global();
let cx = global.get_cx();
- let _ac = JSAutoCompartment::new(cx, global.reflector().get_jsobject().get());
+ let _ac = JSAutoRealm::new(cx, global.reflector().get_jsobject().get());
response.finish(mem::replace(&mut self.body, vec![]));
// TODO
// ... trailerObject is not supported in Servo yet.