diff options
Diffstat (limited to 'components/script/dom')
-rw-r--r-- | components/script/dom/attr.rs | 16 | ||||
-rw-r--r-- | components/script/dom/bindings/mod.rs | 3 | ||||
-rw-r--r-- | components/script/dom/bindings/root.rs | 8 | ||||
-rw-r--r-- | components/script/dom/bindings/str.rs | 12 | ||||
-rw-r--r-- | components/script/dom/dissimilaroriginlocation.rs | 6 | ||||
-rw-r--r-- | components/script/dom/dissimilaroriginwindow.rs | 6 | ||||
-rw-r--r-- | components/script/dom/document.rs | 4 | ||||
-rw-r--r-- | components/script/dom/element.rs | 34 |
8 files changed, 1 insertions, 88 deletions
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<Atom>; 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)] @@ -272,15 +270,6 @@ impl AttrHelpersForLayout for LayoutDom<Attr> { } #[inline] - unsafe fn value_atom_forever(&self) -> Option<Atom> { - 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. match *self.value_forever() { @@ -293,9 +282,4 @@ impl AttrHelpersForLayout for LayoutDom<Attr> { 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<T: DomObject> LayoutDom<T> { 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<Heap<T>>` 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 <https://infra.spec.whatwg.org/#strip-newlines>. 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::<GlobalScope>().origin() - } - pub fn window_proxy(&self) -> DomRoot<WindowProxy> { 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 c4174309af9..66560172517 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; @@ -1031,26 +1029,6 @@ impl LayoutElementHelpers for LayoutDom<Element> { #[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::<HTMLInputElement>() { - 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::<HTMLInputElement>() { - Some(input) => unsafe { input.indeterminate_state_for_layout() }, - None => false, - } - } - - #[inline] - #[allow(unsafe_code)] fn get_state_for_layout(&self) -> ElementState { unsafe { (*self.unsafe_get()).state.get() } } @@ -3293,10 +3271,6 @@ impl Element { self.state.set(state); } - pub fn active_state(&self) -> bool { - self.state.get().contains(ElementState::IN_ACTIVE_STATE) - } - /// <https://html.spec.whatwg.org/multipage/#concept-selector-active> pub fn set_active_state(&self, value: bool) { self.set_state(ElementState::IN_ACTIVE_STATE, value); @@ -3360,18 +3334,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) } |