remove referrer field from ScriptFetchOptions (servo#43532)

Remove `referrer` field from `ScriptFetchOptions` and pass it directly
to `script_fetch_request`.

This keeps ScriptFetchOptions aligned with the HTML 
fixes servo#42875

---------

Signed-off-by: Kelechi Ebiri <ebiritg@gmail.com>

Author: TG199

components/script/dom/globalscope.rs

@@ -2871,7 +2871,7 @@ impl GlobalScope {
 
         run_a_script::<DomTypeHolder, _>(self, || {
             let url = self.api_base_url();
-            let fetch_options = ScriptFetchOptions::default_classic_script(self);
+            let fetch_options = ScriptFetchOptions::default_classic_script();
 
             let no_script_rval = rval.is_none();
 

components/script/dom/html/htmllinkelement.rs

@@ -1032,7 +1032,6 @@ impl HTMLLinkElement {
             parser_metadata: ParserMetadata::NotParserInserted,
             credentials_mode,
             referrer_policy,
-            referrer: global.get_referrer(),
         };
 
         let link = DomRoot::from_ref(self);

components/script/dom/html/htmlscriptelement.rs

@@ -16,7 +16,9 @@ use html5ever::{LocalName, Prefix, local_name};
 use js::context::JSContext;
 use js::rust::{HandleObject, Stencil};
 use net_traits::http_status::HttpStatus;
-use net_traits::request::{CorsSettings, Destination, ParserMetadata, RequestBuilder, RequestId};
+use net_traits::request::{
+    CorsSettings, Destination, ParserMetadata, Referrer, RequestBuilder, RequestId,
+};
 use net_traits::{FetchMetadata, Metadata, NetworkError, ResourceFetchTiming};
 use servo_url::ServoUrl;
 use style::attr::AttrValue;
@@ -513,6 +515,7 @@ pub(crate) fn script_fetch_request(
     url: ServoUrl,
     cors_setting: Option<CorsSettings>,
     options: ScriptFetchOptions,
+    referrer: Referrer,
 ) -> RequestBuilder {
     // We intentionally ignore options' credentials_mode member for classic scripts.
     // The mode is initialized by create_a_potential_cors_request.
@@ -522,7 +525,7 @@ pub(crate) fn script_fetch_request(
         Destination::Script,
         cors_setting,
         None,
-        options.referrer,
+        referrer,
     )
     .parser_metadata(options.parser_metadata)
     .integrity_metadata(options.integrity_metadata.clone())
@@ -542,9 +545,15 @@ fn fetch_a_classic_script(
     // Step 1, 2.
     let doc = script.owner_document();
     let global = script.global();
-    let request =
-        script_fetch_request(doc.webview_id(), url.clone(), cors_setting, options.clone())
-            .with_global_scope(&global);
+    let referrer = global.get_referrer();
+    let request = script_fetch_request(
+        doc.webview_id(),
+        url.clone(),
+        cors_setting,
+        options.clone(),
+        referrer,
+    )
+    .with_global_scope(&global);
 
     // TODO: Step 3, Add custom steps to perform fetch
 
@@ -789,7 +798,6 @@ impl HTMLScriptElement {
             cryptographic_nonce,
             integrity_metadata: integrity_metadata.to_owned(),
             parser_metadata,
-            referrer: self.global().get_referrer(),
             referrer_policy,
             credentials_mode: module_credentials_mode,
         };

components/script/dom/servoparser/prefetch.rs

@@ -149,13 +149,13 @@ impl TokenSink for PrefetchSink {
                         url,
                         cors_setting,
                         ScriptFetchOptions {
-                            referrer: self.referrer.clone(),
                             referrer_policy: self.referrer_policy,
                             integrity_metadata,
                             cryptographic_nonce,
                             credentials_mode: CredentialsMode::CredentialsSameOrigin,
                             parser_metadata: ParserMetadata::ParserInserted,
                         },
+                        self.referrer.clone(),
                     )
                     .insecure_requests_policy(self.insecure_requests_policy)
                     .has_trustworthy_ancestor_origin(self.has_trustworthy_ancestor_origin)

components/script/dom/workers/serviceworkerglobalscope.rs

@@ -414,7 +414,7 @@ impl ServiceWorkerGlobalScope {
                         &mut realm,
                         String::from_utf8_lossy(&source),
                         url,
-                        ScriptFetchOptions::default_classic_script(global_scope),
+                        ScriptFetchOptions::default_classic_script(),
                         ErrorReporting::Unmuted,
                         Some(IntroductionType::WORKER),
                         1,

components/script/dom/workers/workerglobalscope.rs

@@ -211,7 +211,7 @@ impl FetchResponseListener for ScriptFetchContext {
             cx,
             source,
             scope.worker_url.borrow().clone(),
-            ScriptFetchOptions::default_classic_script(global_scope),
+            ScriptFetchOptions::default_classic_script(),
             ErrorReporting::Unmuted,
             Some(IntroductionType::WORKER),
             1,
@@ -743,7 +743,7 @@ impl WorkerGlobalScopeMethods<crate::DomTypeHolder> for WorkerGlobalScope {
                 cx,
                 source,
                 url,
-                ScriptFetchOptions::default_classic_script(&self.globalscope),
+                ScriptFetchOptions::default_classic_script(),
                 ErrorReporting::from(muted_errors),
                 Some(IntroductionType::WORKER),
                 1,

components/script/module_loading.rs

@@ -447,7 +447,7 @@ pub(crate) fn host_load_imported_module(
         ),
         None => (
             // Step 4. Let originalFetchOptions be the default script fetch options.
-            ScriptFetchOptions::default_classic_script(&global_scope),
+            ScriptFetchOptions::default_classic_script(),
             // Step 5. Let fetchReferrer be "client".
             global_scope.get_referrer(),
         ),

components/script/script_module.rs

@@ -957,8 +957,6 @@ pub(crate) unsafe extern "C" fn host_import_module_dynamically(
 #[derive(Clone, Debug, JSTraceable, MallocSizeOf)]
 /// <https://html.spec.whatwg.org/multipage/#script-fetch-options>
 pub(crate) struct ScriptFetchOptions {
-    #[no_trace]
-    pub(crate) referrer: Referrer,
     pub(crate) integrity_metadata: String,
     #[no_trace]
     pub(crate) credentials_mode: CredentialsMode,
@@ -971,11 +969,10 @@ pub(crate) struct ScriptFetchOptions {
 
 impl ScriptFetchOptions {
     /// <https://html.spec.whatwg.org/multipage/#default-classic-script-fetch-options>
-    pub(crate) fn default_classic_script(global: &GlobalScope) -> ScriptFetchOptions {
+    pub(crate) fn default_classic_script() -> ScriptFetchOptions {
         Self {
             cryptographic_nonce: String::new(),
             integrity_metadata: String::new(),
-            referrer: global.get_referrer(),
             parser_metadata: ParserMetadata::NotParserInserted,
             credentials_mode: CredentialsMode::CredentialsSameOrigin,
             referrer_policy: ReferrerPolicy::EmptyString,
@@ -994,7 +991,6 @@ impl ScriptFetchOptions {
         // Step 1. Let newOptions be a copy of originalOptions.
         // TODO Step 4. Set newOptions's fetch priority to "auto".
         Self {
-            referrer: self.referrer.clone(),
             // Step 3. Set newOptions's integrity metadata to integrity.
             integrity_metadata: integrity,
             cryptographic_nonce: self.cryptographic_nonce.clone(),
@@ -1208,7 +1204,6 @@ pub(crate) fn fetch_a_module_worker_script_graph(
     // metadata is "not-parser-inserted", credentials mode is credentialsMode,
     // referrer policy is the empty string, and fetch priority is "auto".
     let options = ScriptFetchOptions {
-        referrer: referrer.clone(),
         integrity_metadata: "".into(),
         credentials_mode,
         cryptographic_nonce: "".into(),

components/script/timers.rs

@@ -792,7 +792,7 @@ impl JsTimerTask {
                 // TODO Step 7. Let initiating script be the active script.
 
                 // Step 9.6.5. Let fetch options be the default script fetch options.
-                let fetch_options = ScriptFetchOptions::default_classic_script(&global);
+                let fetch_options = ScriptFetchOptions::default_classic_script();
 
                 // Step 9.6.6. Let base URL be settings object's API base URL.
                 let base_url = global.api_base_url();