From dfb4a0c844b92fc9b36192d5401b850fdeba9534 Mon Sep 17 00:00:00 2001 From: yvt Date: Tue, 13 Jul 2021 21:25:46 +0900 Subject: [PATCH] refactor(script): remove `{DedicatedWorkerGlobalScope, ServiceWorkerGlobalScope}::origin` --- components/script/dom/dedicatedworkerglobalscope.rs | 6 +----- components/script/dom/serviceworkerglobalscope.rs | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/components/script/dom/dedicatedworkerglobalscope.rs b/components/script/dom/dedicatedworkerglobalscope.rs index e1c67cfafee..1bc71fad4d5 100644 --- a/components/script/dom/dedicatedworkerglobalscope.rs +++ b/components/script/dom/dedicatedworkerglobalscope.rs @@ -53,7 +53,7 @@ use net_traits::IpcSend; use parking_lot::Mutex; use script_traits::{WorkerGlobalScopeInit, WorkerScriptLoadOrigin}; use servo_rand::random; -use servo_url::{MutableOrigin, ServoUrl}; +use servo_url::ServoUrl; use std::mem::replace; use std::sync::atomic::AtomicBool; use std::sync::Arc; @@ -307,10 +307,6 @@ impl DedicatedWorkerGlobalScope { unsafe { DedicatedWorkerGlobalScopeBinding::Wrap(SafeJSContext::from_ptr(cx), scope) } } - pub fn origin(&self) -> MutableOrigin { - MutableOrigin::new(self.workerglobalscope.get_url().origin()) - } - #[allow(unsafe_code)] // https://html.spec.whatwg.org/multipage/#run-a-worker pub fn run_worker_scope( diff --git a/components/script/dom/serviceworkerglobalscope.rs b/components/script/dom/serviceworkerglobalscope.rs index 089b8c83590..0c5a37709c4 100644 --- a/components/script/dom/serviceworkerglobalscope.rs +++ b/components/script/dom/serviceworkerglobalscope.rs @@ -43,7 +43,7 @@ use parking_lot::Mutex; use script_traits::{ScopeThings, ServiceWorkerMsg, WorkerGlobalScopeInit, WorkerScriptLoadOrigin}; use servo_config::pref; use servo_rand::random; -use servo_url::{MutableOrigin, ServoUrl}; +use servo_url::ServoUrl; use std::sync::atomic::AtomicBool; use std::sync::Arc; use std::thread::{self, JoinHandle}; @@ -279,10 +279,6 @@ impl ServiceWorkerGlobalScope { unsafe { ServiceWorkerGlobalScopeBinding::Wrap(SafeJSContext::from_ptr(cx), scope) } } - pub fn origin(&self) -> MutableOrigin { - MutableOrigin::new(self.scope_url.origin()) - } - #[allow(unsafe_code)] // https://html.spec.whatwg.org/multipage/#run-a-worker pub fn run_serviceworker_scope(