From 8b6ed3d1823876fa7e3c5ff6b1a9036aa22a72f4 Mon Sep 17 00:00:00 2001 From: est31 Date: Sun, 2 Jun 2019 07:10:40 +0200 Subject: [PATCH] Remove unused code from script* crates --- components/script/compartments.rs | 4 --- components/script/document_loader.rs | 18 ---------- components/script/dom/attr.rs | 16 --------- components/script/dom/bindings/mod.rs | 3 -- components/script/dom/bindings/root.rs | 8 ----- components/script/dom/bindings/str.rs | 12 +------ .../script/dom/dissimilaroriginlocation.rs | 6 ---- .../script/dom/dissimilaroriginwindow.rs | 6 ---- components/script/dom/document.rs | 4 --- components/script/dom/element.rs | 34 ------------------- components/script/script_thread.rs | 15 -------- components/script_layout_interface/rpc.rs | 5 +-- components/script_traits/lib.rs | 4 --- 13 files changed, 2 insertions(+), 133 deletions(-) diff --git a/components/script/compartments.rs b/components/script/compartments.rs index 552b7573d83..d047f7fdbcb 100644 --- a/components/script/compartments.rs +++ b/components/script/compartments.rs @@ -27,8 +27,4 @@ impl<'a> InCompartment<'a> { pub fn in_compartment(token: &AlreadyInCompartment) -> InCompartment { InCompartment::Already(token) } - - pub fn entered(token: &JSAutoRealm) -> InCompartment { - InCompartment::Entered(token) - } } diff --git a/components/script/document_loader.rs b/components/script/document_loader.rs index ef4075d6599..ef60cbc2a6c 100644 --- a/components/script/document_loader.rs +++ b/components/script/document_loader.rs @@ -25,19 +25,6 @@ pub enum LoadType { Media, } -impl LoadType { - fn url(&self) -> Option<&ServoUrl> { - match *self { - LoadType::Image(ref url) | - LoadType::Script(ref url) | - LoadType::Subframe(ref url) | - LoadType::Stylesheet(ref url) | - LoadType::PageSource(ref url) => Some(url), - LoadType::Media => None, - } - } -} - /// Canary value ensuring that manually added blocking loads (ie. ones that weren't /// created via DocumentLoader::fetch_async) are always removed by the time /// that the owner is destroyed. @@ -67,11 +54,6 @@ impl LoadBlocker { } *blocker = None; } - - /// Return the url associated with this load. - pub fn url(&self) -> Option<&ServoUrl> { - self.load.as_ref().and_then(LoadType::url) - } } impl Drop for LoadBlocker { diff --git a/components/script/dom/attr.rs b/components/script/dom/attr.rs index e9f534350fe..269627bf870 100644 --- a/components/script/dom/attr.rs +++ b/components/script/dom/attr.rs @@ -252,10 +252,8 @@ impl Attr { pub trait AttrHelpersForLayout { unsafe fn value_forever(&self) -> &'static AttrValue; unsafe fn value_ref_forever(&self) -> &'static str; - unsafe fn value_atom_forever(&self) -> Option; unsafe fn value_tokens_forever(&self) -> Option<&'static [Atom]>; unsafe fn local_name_atom_forever(&self) -> LocalName; - unsafe fn value_for_layout(&self) -> &AttrValue; } #[allow(unsafe_code)] @@ -271,15 +269,6 @@ impl AttrHelpersForLayout for LayoutDom { &**self.value_forever() } - #[inline] - unsafe fn value_atom_forever(&self) -> Option { - let value = (*self.unsafe_get()).value.borrow_for_layout(); - match *value { - AttrValue::Atom(ref val) => Some(val.clone()), - _ => None, - } - } - #[inline] unsafe fn value_tokens_forever(&self) -> Option<&'static [Atom]> { // This transmute is used to cheat the lifetime restriction. @@ -293,9 +282,4 @@ impl AttrHelpersForLayout for LayoutDom { unsafe fn local_name_atom_forever(&self) -> LocalName { (*self.unsafe_get()).identifier.local_name.clone() } - - #[inline] - unsafe fn value_for_layout(&self) -> &AttrValue { - (*self.unsafe_get()).value.borrow_for_layout() - } } diff --git a/components/script/dom/bindings/mod.rs b/components/script/dom/bindings/mod.rs index 4ddbc43fa35..c6759edb360 100644 --- a/components/script/dom/bindings/mod.rs +++ b/components/script/dom/bindings/mod.rs @@ -168,9 +168,6 @@ pub mod codegen { pub mod InterfaceObjectMap { include!(concat!(env!("OUT_DIR"), "/InterfaceObjectMap.rs")); } - pub mod InterfaceTypes { - include!(concat!(env!("OUT_DIR"), "/InterfaceTypes.rs")); - } #[allow(dead_code, unused_imports)] pub mod InheritTypes { include!(concat!(env!("OUT_DIR"), "/InheritTypes.rs")); diff --git a/components/script/dom/bindings/root.rs b/components/script/dom/bindings/root.rs index 940e0700b85..228015b1275 100644 --- a/components/script/dom/bindings/root.rs +++ b/components/script/dom/bindings/root.rs @@ -671,14 +671,6 @@ impl LayoutDom { debug_assert!(thread_state::get().is_layout()); self.ptr.as_ptr() } - - /// Returns a reference to the interior of this JS object. This method is - /// safe to call because it originates from the layout thread, and it cannot - /// mutate DOM nodes. - pub fn get_for_script(&self) -> &T { - debug_assert!(thread_state::get().is_script()); - unsafe { &*self.ptr.as_ptr() } - } } /// Helper trait for safer manipulations of `Option>` values. diff --git a/components/script/dom/bindings/str.rs b/components/script/dom/bindings/str.rs index dfeedc636d6..e08159bc1e2 100644 --- a/components/script/dom/bindings/str.rs +++ b/components/script/dom/bindings/str.rs @@ -17,7 +17,7 @@ use std::marker::PhantomData; use std::ops; use std::ops::{Deref, DerefMut}; use std::str; -use std::str::{Bytes, FromStr}; +use std::str::FromStr; /// Encapsulates the IDL `ByteString` type. #[derive(Clone, Debug, Default, Eq, JSTraceable, MallocSizeOf, PartialEq)] @@ -40,11 +40,6 @@ impl ByteString { self.0.len() } - /// Compare `self` to `other`, matching A–Z and a–z as equal. - pub fn eq_ignore_case(&self, other: &ByteString) -> bool { - self.0.eq_ignore_ascii_case(&other.0) - } - /// Returns `self` with A–Z replaced by a–z. pub fn to_lower(&self) -> ByteString { ByteString::new(self.0.to_ascii_lowercase()) @@ -219,11 +214,6 @@ impl DOMString { self.0.truncate(new_len); } - /// An iterator over the bytes of this `DOMString`. - pub fn bytes(&self) -> Bytes { - self.0.bytes() - } - /// Removes newline characters according to . pub fn strip_newlines(&mut self) { self.0.retain(|c| c != '\r' && c != '\n'); diff --git a/components/script/dom/dissimilaroriginlocation.rs b/components/script/dom/dissimilaroriginlocation.rs index 79d0a00b7a5..f7b978bc185 100644 --- a/components/script/dom/dissimilaroriginlocation.rs +++ b/components/script/dom/dissimilaroriginlocation.rs @@ -12,7 +12,6 @@ use crate::dom::bindings::str::DOMString; use crate::dom::bindings::str::USVString; use crate::dom::dissimilaroriginwindow::DissimilarOriginWindow; use dom_struct::dom_struct; -use servo_url::MutableOrigin; /// Represents a dissimilar-origin `Location` that exists in another script thread. /// @@ -46,11 +45,6 @@ impl DissimilarOriginLocation { DissimilarOriginLocationBinding::Wrap, ) } - - #[allow(dead_code)] - pub fn origin(&self) -> &MutableOrigin { - self.window.origin() - } } impl DissimilarOriginLocationMethods for DissimilarOriginLocation { diff --git a/components/script/dom/dissimilaroriginwindow.rs b/components/script/dom/dissimilaroriginwindow.rs index 4814862881a..b66db40da3b 100644 --- a/components/script/dom/dissimilaroriginwindow.rs +++ b/components/script/dom/dissimilaroriginwindow.rs @@ -5,7 +5,6 @@ use crate::dom::bindings::codegen::Bindings::DissimilarOriginWindowBinding; use crate::dom::bindings::codegen::Bindings::DissimilarOriginWindowBinding::DissimilarOriginWindowMethods; use crate::dom::bindings::error::{Error, ErrorResult}; -use crate::dom::bindings::inheritance::Castable; use crate::dom::bindings::root::{Dom, DomRoot, MutNullableDom}; use crate::dom::bindings::str::DOMString; use crate::dom::bindings::structuredclone::StructuredCloneData; @@ -20,7 +19,6 @@ use js::rust::HandleValue; use msg::constellation_msg::PipelineId; use script_traits::ScriptMsg; use servo_url::ImmutableOrigin; -use servo_url::MutableOrigin; use servo_url::ServoUrl; /// Represents a dissimilar-origin `Window` that exists in another script thread. @@ -71,10 +69,6 @@ impl DissimilarOriginWindow { unsafe { DissimilarOriginWindowBinding::Wrap(cx, win) } } - pub fn origin(&self) -> &MutableOrigin { - self.upcast::().origin() - } - pub fn window_proxy(&self) -> DomRoot { DomRoot::from_ref(&*self.window_proxy) } diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index 7eb43c81b79..3583e7b8842 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -473,10 +473,6 @@ impl Document { self.https_state.set(https_state); } - pub fn is_completely_loaded(&self) -> bool { - self.completely_loaded.get() - } - pub fn is_fully_active(&self) -> bool { self.activity.get() == DocumentActivity::FullyActive } diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs index 1b918c0537b..d3e5ab25881 100644 --- a/components/script/dom/element.rs +++ b/components/script/dom/element.rs @@ -600,8 +600,6 @@ pub trait LayoutElementHelpers { fn local_name(&self) -> &LocalName; fn namespace(&self) -> &Namespace; fn get_lang_for_layout(&self) -> String; - fn get_checked_state_for_layout(&self) -> bool; - fn get_indeterminate_state_for_layout(&self) -> bool; fn get_state_for_layout(&self) -> ElementState; fn insert_selector_flags(&self, flags: ElementSelectorFlags); fn has_selector_flags(&self, flags: ElementSelectorFlags) -> bool; @@ -1029,26 +1027,6 @@ impl LayoutElementHelpers for LayoutDom { } } - #[inline] - #[allow(unsafe_code)] - fn get_checked_state_for_layout(&self) -> bool { - // TODO option and menuitem can also have a checked state. - match self.downcast::() { - Some(input) => unsafe { input.checked_state_for_layout() }, - None => false, - } - } - - #[inline] - #[allow(unsafe_code)] - fn get_indeterminate_state_for_layout(&self) -> bool { - // TODO progress elements can also be matched with :indeterminate - match self.downcast::() { - Some(input) => unsafe { input.indeterminate_state_for_layout() }, - None => false, - } - } - #[inline] #[allow(unsafe_code)] fn get_state_for_layout(&self) -> ElementState { @@ -3289,10 +3267,6 @@ impl Element { self.state.set(state); } - pub fn active_state(&self) -> bool { - self.state.get().contains(ElementState::IN_ACTIVE_STATE) - } - /// pub fn set_active_state(&self, value: bool) { self.set_state(ElementState::IN_ACTIVE_STATE, value); @@ -3356,18 +3330,10 @@ impl Element { } } - pub fn target_state(&self) -> bool { - self.state.get().contains(ElementState::IN_TARGET_STATE) - } - pub fn set_target_state(&self, value: bool) { self.set_state(ElementState::IN_TARGET_STATE, value) } - pub fn fullscreen_state(&self) -> bool { - self.state.get().contains(ElementState::IN_FULLSCREEN_STATE) - } - pub fn set_fullscreen_state(&self, value: bool) { self.set_state(ElementState::IN_FULLSCREEN_STATE, value) } diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs index 3d8d5bb1acc..f284e14dd0c 100644 --- a/components/script/script_thread.rs +++ b/components/script/script_thread.rs @@ -451,20 +451,12 @@ impl Documents { .map(|ref doc| DomRoot::from_ref(&**doc)) } - pub fn is_empty(&self) -> bool { - self.map.is_empty() - } - pub fn find_document(&self, pipeline_id: PipelineId) -> Option> { self.map .get(&pipeline_id) .map(|doc| DomRoot::from_ref(&**doc)) } - pub fn len(&self) -> usize { - self.map.len() - } - pub fn find_window(&self, pipeline_id: PipelineId) -> Option> { self.find_document(pipeline_id) .map(|doc| DomRoot::from_ref(doc.window())) @@ -824,13 +816,6 @@ impl ScriptThread { }) } - pub fn invoke_perform_a_microtask_checkpoint() { - SCRIPT_THREAD_ROOT.with(|root| { - let script_thread = unsafe { &*root.get().unwrap() }; - script_thread.perform_a_microtask_checkpoint() - }) - } - pub fn page_headers_available( id: &PipelineId, metadata: Option, diff --git a/components/script_layout_interface/rpc.rs b/components/script_layout_interface/rpc.rs index 3e759334ed4..f77b7e63836 100644 --- a/components/script_layout_interface/rpc.rs +++ b/components/script_layout_interface/rpc.rs @@ -3,10 +3,9 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ use app_units::Au; -use euclid::{Point2D, Rect}; +use euclid::Rect; use script_traits::UntrustedNodeAddress; use servo_arc::Arc; -use style::properties::longhands::overflow_x; use style::properties::ComputedValues; use webrender_api::ExternalScrollId; @@ -50,8 +49,6 @@ pub struct NodeGeometryResponse { pub client_rect: Rect, } -pub struct NodeOverflowResponse(pub Option>); - pub struct NodeScrollIdResponse(pub ExternalScrollId); pub struct ResolvedStyleResponse(pub String); diff --git a/components/script_traits/lib.rs b/components/script_traits/lib.rs index d5a030323f6..de05de657bd 100644 --- a/components/script_traits/lib.rs +++ b/components/script_traits/lib.rs @@ -550,10 +550,6 @@ pub type NsDuration = Length; pub fn precise_time_ms() -> MsDuration { Length::new(time::precise_time_ns() / (1000 * 1000)) } -/// Returns the duration since an unspecified epoch measured in ns. -pub fn precise_time_ns() -> NsDuration { - Length::new(time::precise_time_ns()) -} /// Data needed to construct a script thread. ///