Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Bug 1366427: Make backdrop not inherit from the parent element. r=heycam

Browse source 
MozReview-Commit-ID: EnnmvDsgbdx
Signed-off-by: Emilio Cobos Álvarez <emilio@crisal.io>
This commit is contained in:
Emilio Cobos Álvarez 2017-05-20 11:56:48 +02:00
parent 3d40b516c8
commit 71dbc6c023
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
3 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
components/style/gecko/pseudo_element.rs
View file

@ -49,6 +49,15 @@ impl PseudoElement {
PseudoElementCascadeType::Lazy
}
/// Whether the pseudo-element should inherit from the default computed
/// values instead of from the parent element.
///
/// This is not the common thing, but there are some pseudos (namely:
/// ::backdrop), that shouldn't inherit from the parent element.
pub fn inherits_from_default_values(&self) -> bool {
!matches!(*self, PseudoElement::Backdrop)
}
/// Gets the canonical index of this eagerly-cascaded pseudo-element.
#[inline]
pub fn eager_index(&self) -> usize {

6
components/style/stylist.rs
View file

@ -630,7 +630,7 @@ impl Stylist {
guards: &StylesheetGuards,
element: &E,
pseudo: &PseudoElement,
parent: &Arc<ComputedValues>,
parent_style: &ComputedValues,
font_metrics: &FontMetricsProvider)
-> Option<ComputedStyle>
where E: TElement,
@ -649,8 +649,8 @@ impl Stylist {
properties::cascade(&self.device,
&rule_node,
guards,
Some(&**parent),
Some(&**parent),
Some(parent_style),
Some(parent_style),
None,
&RustLogReporter,
font_metrics,

6
ports/geckolib/glue.rs
View file

@ -1205,7 +1205,11 @@ fn get_pseudo_style(guard: &SharedRwLockReadGuard,
PseudoElementCascadeType::Precomputed => unreachable!("No anonymous boxes"),
PseudoElementCascadeType::Lazy => {
let d = doc_data.borrow_mut();
let base = styles.primary.values();
let base = if pseudo.inherits_from_default_values() {
d.default_computed_values()
} else {
styles.primary.values()
};
let guards = StylesheetGuards::same(guard);
let metrics = get_metrics_provider_for_product();
d.stylist.lazily_compute_pseudo_element_style(&guards,