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

Add support for skipping display fixup for pseudos.

Browse source 
This is needed for https://bugzilla.mozilla.org/show_bug.cgi?id=1346481
This commit is contained in:
Boris Zbarsky 2017-03-10 23:46:21 -05:00
parent 96a3bb5f16
commit 275865486e
4 changed files with 24 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

1
components/style/gecko_bindings/bindings.rs
View file

@ -1666,6 +1666,7 @@ extern "C" {
pub fn Servo_ComputedValues_GetForAnonymousBox(parent_style_or_null:
ServoComputedValuesBorrowedOrNull,
pseudoTag: *mut nsIAtom,
skip_display_fixup: bool,
set:
RawServoStyleSetBorrowed)
-> ServoComputedValuesStrong;

19
components/style/stylist.rs
View file

@ -14,7 +14,9 @@ use keyframes::KeyframesAnimation;
use media_queries::Device;
use parking_lot::RwLock;
use pdqsort::sort_by;
use properties::{self, CascadeFlags, ComputedValues, INHERIT_ALL};
use properties::{self, CascadeFlags, ComputedValues};
#[cfg(feature = "servo")]
use properties::INHERIT_ALL;
use properties::PropertyDeclarationBlock;
use restyle_hints::{RestyleHint, DependencySet};
use rule_tree::{CascadeLevel, RuleTree, StrongRuleNode, StyleSource};
@ -294,7 +296,7 @@ impl Stylist {
pseudo: &PseudoElement,
parent: Option<&Arc<ComputedValues>>,
default: &Arc<ComputedValues>,
inherit_all: bool)
cascade_flags: CascadeFlags)
-> ComputedStyle {
debug_assert!(SelectorImpl::pseudo_element_cascade_type(pseudo).is_precomputed());
@ -308,11 +310,6 @@ impl Stylist {
None => self.rule_tree.root(),
};
let mut flags = CascadeFlags::empty();
if inherit_all {
flags.insert(INHERIT_ALL)
}
// NOTE(emilio): We skip calculating the proper layout parent style
// here.
//
@ -335,7 +332,7 @@ impl Stylist {
default,
None,
Box::new(StdoutErrorReporter),
flags);
cascade_flags);
ComputedStyle::new(rule_node, Arc::new(computed))
}
@ -363,7 +360,11 @@ impl Stylist {
unreachable!("That pseudo doesn't represent an anonymous box!")
}
};
self.precomputed_values_for_pseudo(&pseudo, Some(parent_style), default_style, inherit_all)
let mut cascade_flags = CascadeFlags::empty();
if inherit_all {
cascade_flags.insert(INHERIT_ALL);
}
self.precomputed_values_for_pseudo(&pseudo, Some(parent_style), default_style, cascade_flags)
.values.unwrap()
}