aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/request.rs
diff options
context:
space:
mode:
Diffstat (limited to 'components/script/dom/request.rs')
-rw-r--r--components/script/dom/request.rs16
1 files changed, 9 insertions, 7 deletions
diff --git a/components/script/dom/request.rs b/components/script/dom/request.rs
index 7bd89875b6f..1ddf1c7742a 100644
--- a/components/script/dom/request.rs
+++ b/components/script/dom/request.rs
@@ -16,7 +16,7 @@ use crate::dom::bindings::codegen::Bindings::RequestBinding::RequestMethods;
use crate::dom::bindings::codegen::Bindings::RequestBinding::RequestMode;
use crate::dom::bindings::codegen::Bindings::RequestBinding::RequestRedirect;
use crate::dom::bindings::error::{Error, Fallible};
-use crate::dom::bindings::reflector::{reflect_dom_object, DomObject, Reflector};
+use crate::dom::bindings::reflector::{reflect_dom_object2, DomObject, Reflector};
use crate::dom::bindings::root::{DomRoot, MutNullableDom};
use crate::dom::bindings::str::{ByteString, DOMString, USVString};
use crate::dom::bindings::trace::RootedTraceableBox;
@@ -30,6 +30,7 @@ use http::header::{HeaderName, HeaderValue};
use http::method::InvalidMethod;
use http::Method as HttpMethod;
use js::jsapi::JSObject;
+use js::rust::HandleObject;
use net_traits::request::CacheMode as NetTraitsRequestCache;
use net_traits::request::CredentialsMode as NetTraitsRequestCredentials;
use net_traits::request::Destination as NetTraitsRequestDestination;
@@ -62,14 +63,15 @@ impl Request {
}
}
- pub fn new(global: &GlobalScope, url: ServoUrl) -> DomRoot<Request> {
- reflect_dom_object(Box::new(Request::new_inherited(global, url)), global)
+ fn new(global: &GlobalScope, proto: Option<HandleObject>, url: ServoUrl) -> DomRoot<Request> {
+ reflect_dom_object2(Box::new(Request::new_inherited(global, url)), global, proto)
}
// https://fetch.spec.whatwg.org/#dom-request
#[allow(non_snake_case)]
pub fn Constructor(
global: &GlobalScope,
+ proto: Option<HandleObject>,
mut input: RequestInfo,
init: RootedTraceableBox<RequestInit>,
) -> Fallible<DomRoot<Request>> {
@@ -289,7 +291,7 @@ impl Request {
// Step 27 TODO: "If init["priority"] exists..."
// Step 28
- let r = Request::from_net_request(global, request);
+ let r = Request::from_net_request(global, proto, request);
// Step 29 TODO: "Set this's signal to new AbortSignal object..."
// Step 30 TODO: "If signal is not null..."
@@ -438,8 +440,8 @@ impl Request {
}
impl Request {
- fn from_net_request(global: &GlobalScope, net_request: NetTraitsRequest) -> DomRoot<Request> {
- let r = Request::new(global, net_request.current_url());
+ fn from_net_request(global: &GlobalScope, proto: Option<HandleObject>, net_request: NetTraitsRequest) -> DomRoot<Request> {
+ let r = Request::new(global, proto, net_request.current_url());
*r.request.borrow_mut() = net_request;
r
}
@@ -448,7 +450,7 @@ impl Request {
let req = r.request.borrow();
let url = req.url();
let headers_guard = r.Headers().get_guard();
- let r_clone = Request::new(&r.global(), url);
+ let r_clone = Request::new(&r.global(), None, url);
r_clone.request.borrow_mut().pipeline_id = req.pipeline_id;
{
let mut borrowed_r_request = r_clone.request.borrow_mut();