Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

style: Use Default for ExtraStyleData instead of Option.

Browse source
This commit is contained in:
Emilio Cobos Álvarez 2018-01-12 11:04:24 +01:00
parent 9a1f20f1e8
commit 335ca47361
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
4 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/selectors/context.rs
View file

@ -131,7 +131,7 @@ where
pub pseudo_element_matching_fn: Option<&'a Fn(&Impl::PseudoElement) -> bool>,
/// Extra implementation-dependent matching data.
pub extra_data: Option<Impl::ExtraMatchingData>,
pub extra_data: Impl::ExtraMatchingData,
quirks_mode: QuirksMode,
classes_and_ids_case_sensitivity: CaseSensitivity,
@ -176,7 +176,7 @@ where
scope_element: None,
nesting_level: 0,
pseudo_element_matching_fn: None,
extra_data: None,
extra_data: Default::default(),
_impl: ::std::marker::PhantomData,
}
}

2
components/selectors/parser.rs
View file

@ -84,7 +84,7 @@ macro_rules! with_all_bounds {
/// are parameterized on SelectorImpl. See
/// <https://github.com/rust-lang/rust/issues/26925>
pub trait SelectorImpl: Clone + Sized + 'static {
type ExtraMatchingData: Sized + 'static;
type ExtraMatchingData: Sized + Default + 'static;
type AttrValue: $($InSelector)*;
type Identifier: $($InSelector)* + PrecomputedHash;
type ClassName: $($InSelector)* + PrecomputedHash;

12
components/style/gecko/wrapper.rs
View file

@ -2111,10 +2111,8 @@ impl<'le> ::selectors::Element for GeckoElement<'le> {
}
NonTSPseudoClass::MozWindowInactive => {
let state_bit = DocumentState::NS_DOCUMENT_STATE_WINDOW_INACTIVE;
if let Some(ref invalidation_data) = context.extra_data {
if invalidation_data.document_state.intersects(state_bit) {
return true;
}
if context.extra_data.document_state.intersects(state_bit) {
return true;
}
self.document_state().contains(state_bit)
@ -2133,12 +2131,10 @@ impl<'le> ::selectors::Element for GeckoElement<'le> {
}
NonTSPseudoClass::MozLocaleDir(ref dir) => {
let state_bit = DocumentState::NS_DOCUMENT_STATE_RTL_LOCALE;
if let Some(ref invalidation_data) = context.extra_data {
if context.extra_data.document_state.intersects(state_bit) {
// NOTE(emilio): We could still return false for
// Direction::Other(..), but we don't bother.
if invalidation_data.document_state.intersects(state_bit) {
return true;
}
return true;
}
let doc_is_rtl = self.document_state().contains(state_bit);

13
components/style/invalidation/element/document_state.rs
View file

@ -19,6 +19,15 @@ pub struct InvalidationMatchingData {
pub document_state: DocumentState,
}
impl Default for InvalidationMatchingData {
#[inline(always)]
fn default() -> Self {
Self {
document_state: DocumentState::empty(),
}
}
}
/// An invalidation processor for style changes due to state and attribute
/// changes.
pub struct DocumentStateInvalidationProcessor<'a, E: TElement> {
@ -46,9 +55,9 @@ impl<'a, E: TElement> DocumentStateInvalidationProcessor<'a, E> {
quirks_mode,
);
matching_context.extra_data = Some(InvalidationMatchingData {
matching_context.extra_data = InvalidationMatchingData {
document_state: document_states_changed,
});
};
Self { rules, document_states_changed, matching_context }
}