diff options
author | yvt <i@yvt.jp> | 2021-07-13 21:12:44 +0900 |
---|---|---|
committer | yvt <i@yvt.jp> | 2021-07-13 21:12:44 +0900 |
commit | 90b78a193cbcbb5e32e88167135e03ed93635540 (patch) | |
tree | 36019ee64a96e974ddf7f5fcd89b57a76dfb23bb /components/script/dom | |
parent | c3de9b72a62268bb2c2cc60a83bb593d70e1d04f (diff) | |
download | servo-90b78a193cbcbb5e32e88167135e03ed93635540.tar.gz servo-90b78a193cbcbb5e32e88167135e03ed93635540.zip |
Revert "feat(script): add `{DissimilarOriginWindow, PaintWorkletGlobalScope, TestWorkletGlobalScope}::origin`"
This reverts commit 5959c2ef9b343edc5562f4efee2877334672e841.
Diffstat (limited to 'components/script/dom')
-rw-r--r-- | components/script/dom/dissimilaroriginwindow.rs | 6 | ||||
-rw-r--r-- | components/script/dom/paintworkletglobalscope.rs | 5 | ||||
-rw-r--r-- | components/script/dom/testworkletglobalscope.rs | 6 | ||||
-rw-r--r-- | components/script/dom/workletglobalscope.rs | 4 |
4 files changed, 2 insertions, 19 deletions
diff --git a/components/script/dom/dissimilaroriginwindow.rs b/components/script/dom/dissimilaroriginwindow.rs index 079dcfa71fd..989aec3ff3d 100644 --- a/components/script/dom/dissimilaroriginwindow.rs +++ b/components/script/dom/dissimilaroriginwindow.rs @@ -20,7 +20,7 @@ use js::jsval::{JSVal, UndefinedValue}; use js::rust::{CustomAutoRooter, CustomAutoRooterGuard, HandleValue}; use msg::constellation_msg::PipelineId; use script_traits::{ScriptMsg, StructuredSerializedData}; -use servo_url::{MutableOrigin, ServoUrl}; +use servo_url::ServoUrl; /// Represents a dissimilar-origin `Window` that exists in another script thread. /// @@ -194,10 +194,6 @@ impl DissimilarOriginWindowMethods for DissimilarOriginWindow { } impl DissimilarOriginWindow { - pub fn origin(&self) -> &MutableOrigin { - self.globalscope.origin() - } - /// https://html.spec.whatwg.org/multipage/#window-post-message-steps fn post_message_impl( &self, diff --git a/components/script/dom/paintworkletglobalscope.rs b/components/script/dom/paintworkletglobalscope.rs index d8c3cd552fd..888a6b16574 100644 --- a/components/script/dom/paintworkletglobalscope.rs +++ b/components/script/dom/paintworkletglobalscope.rs @@ -52,7 +52,6 @@ use script_traits::Painter; use script_traits::{DrawAPaintImageResult, PaintWorkletError}; use servo_atoms::Atom; use servo_config::pref; -use servo_url::MutableOrigin; use servo_url::ServoUrl; use std::cell::Cell; use std::collections::hash_map::Entry; @@ -137,10 +136,6 @@ impl PaintWorkletGlobalScope { self.image_cache.clone() } - pub fn origin(&self) -> &MutableOrigin { - self.worklet_global.origin() - } - pub fn perform_a_worklet_task(&self, task: PaintWorkletTask) { match task { PaintWorkletTask::DrawAPaintImage( diff --git a/components/script/dom/testworkletglobalscope.rs b/components/script/dom/testworkletglobalscope.rs index f4394f7f133..c67e1536457 100644 --- a/components/script/dom/testworkletglobalscope.rs +++ b/components/script/dom/testworkletglobalscope.rs @@ -15,7 +15,7 @@ use crossbeam_channel::Sender; use dom_struct::dom_struct; use js::rust::Runtime; use msg::constellation_msg::PipelineId; -use servo_url::{MutableOrigin, ServoUrl}; +use servo_url::ServoUrl; use std::collections::HashMap; // check-tidy: no specs after this line @@ -53,10 +53,6 @@ impl TestWorkletGlobalScope { unsafe { TestWorkletGlobalScopeBinding::Wrap(JSContext::from_ptr(runtime.cx()), global) } } - pub fn origin(&self) -> &MutableOrigin { - self.worklet_global.origin() - } - pub fn perform_a_worklet_task(&self, task: TestWorkletTask) { match task { TestWorkletTask::Lookup(key, sender) => { diff --git a/components/script/dom/workletglobalscope.rs b/components/script/dom/workletglobalscope.rs index 025f8268cd7..29d5b9b7f99 100644 --- a/components/script/dom/workletglobalscope.rs +++ b/components/script/dom/workletglobalscope.rs @@ -84,10 +84,6 @@ impl WorkletGlobalScope { } } - pub fn origin(&self) -> &MutableOrigin { - self.globalscope.origin() - } - /// Get the JS context. pub fn get_cx(&self) -> JSContext { self.globalscope.get_cx() |