diff options
Diffstat (limited to 'components/script/dom')
-rw-r--r-- | components/script/dom/htmlscriptelement.rs | 14 | ||||
-rw-r--r-- | components/script/dom/request.rs | 12 | ||||
-rw-r--r-- | components/script/dom/xmlhttprequest.rs | 2 |
3 files changed, 14 insertions, 14 deletions
diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs index 3b2057e4338..e59ba27433b 100644 --- a/components/script/dom/htmlscriptelement.rs +++ b/components/script/dom/htmlscriptelement.rs @@ -33,7 +33,7 @@ use ipc_channel::ipc; use ipc_channel::router::ROUTER; use js::jsval::UndefinedValue; use net_traits::{FetchMetadata, FetchResponseListener, Metadata, NetworkError}; -use net_traits::request::{CORSSettings, CredentialsMode, Destination, RequestInit, RequestMode, Type as RequestType}; +use net_traits::request::{CorsSettings, CredentialsMode, Destination, RequestInit, RequestMode, Type as RequestType}; use network_listener::{NetworkListener, PreInvoke}; use servo_atoms::Atom; use std::ascii::AsciiExt; @@ -221,7 +221,7 @@ impl PreInvoke for ScriptContext {} /// https://html.spec.whatwg.org/multipage/#fetch-a-classic-script fn fetch_a_classic_script(script: &HTMLScriptElement, url: Url, - cors_setting: Option<CORSSettings>, + cors_setting: Option<CorsSettings>, character_encoding: EncodingRef) { let doc = document_from_node(script); @@ -233,13 +233,13 @@ fn fetch_a_classic_script(script: &HTMLScriptElement, // https://html.spec.whatwg.org/multipage/#create-a-potential-cors-request // Step 1 mode: match cors_setting { - Some(_) => RequestMode::CORSMode, - None => RequestMode::NoCORS, + Some(_) => RequestMode::CorsMode, + None => RequestMode::NoCors, }, // https://html.spec.whatwg.org/multipage/#create-a-potential-cors-request // Step 3-4 credentials_mode: match cors_setting { - Some(CORSSettings::Anonymous) => CredentialsMode::CredentialsSameOrigin, + Some(CorsSettings::Anonymous) => CredentialsMode::CredentialsSameOrigin, _ => CredentialsMode::Include, }, origin: doc.url().clone(), @@ -358,8 +358,8 @@ impl HTMLScriptElement { // Step 14. let cors_setting = match self.GetCrossOrigin() { - Some(ref s) if *s == "anonymous" => Some(CORSSettings::Anonymous), - Some(ref s) if *s == "use-credentials" => Some(CORSSettings::UseCredentials), + Some(ref s) if *s == "anonymous" => Some(CorsSettings::Anonymous), + Some(ref s) if *s == "use-credentials" => Some(CorsSettings::UseCredentials), None => None, _ => unreachable!() }; diff --git a/components/script/dom/request.rs b/components/script/dom/request.rs index e9cee6da938..c393616a820 100644 --- a/components/script/dom/request.rs +++ b/components/script/dom/request.rs @@ -114,7 +114,7 @@ impl Request { url, false); // Step 5.5 - fallback_mode = Some(NetTraitsRequestMode::CORSMode); + fallback_mode = Some(NetTraitsRequestMode::CorsMode); // Step 5.6 fallback_credentials = Some(NetTraitsRequestCredentials::Omit); } @@ -325,7 +325,7 @@ impl Request { r.Headers().empty_header_list(); // Step 30 - if r.request.borrow().mode == NetTraitsRequestMode::NoCORS { + if r.request.borrow().mode == NetTraitsRequestMode::NoCors { let borrowed_request = r.request.borrow(); // Step 30.1 if !is_cors_safelisted_method(&borrowed_request.method.borrow()) { @@ -793,8 +793,8 @@ impl Into<NetTraitsRequestMode> for RequestMode { match self { RequestMode::Navigate => NetTraitsRequestMode::Navigate, RequestMode::Same_origin => NetTraitsRequestMode::SameOrigin, - RequestMode::No_cors => NetTraitsRequestMode::NoCORS, - RequestMode::Cors => NetTraitsRequestMode::CORSMode, + RequestMode::No_cors => NetTraitsRequestMode::NoCors, + RequestMode::Cors => NetTraitsRequestMode::CorsMode, } } } @@ -804,8 +804,8 @@ impl Into<RequestMode> for NetTraitsRequestMode { match self { NetTraitsRequestMode::Navigate => RequestMode::Navigate, NetTraitsRequestMode::SameOrigin => RequestMode::Same_origin, - NetTraitsRequestMode::NoCORS => RequestMode::No_cors, - NetTraitsRequestMode::CORSMode => RequestMode::Cors, + NetTraitsRequestMode::NoCors => RequestMode::No_cors, + NetTraitsRequestMode::CorsMode => RequestMode::Cors, } } } diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs index c404c482308..ab603f5c444 100644 --- a/components/script/dom/xmlhttprequest.rs +++ b/components/script/dom/xmlhttprequest.rs @@ -590,7 +590,7 @@ impl XMLHttpRequestMethods for XMLHttpRequest { // https://github.com/whatwg/xhr/issues/71 destination: Destination::None, synchronous: self.sync.get(), - mode: RequestMode::CORSMode, + mode: RequestMode::CorsMode, use_cors_preflight: has_handlers, credentials_mode: credentials_mode, use_url_credentials: use_url_credentials, |