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

Auto merge of #8341 - bholley:state_hint_selector_ordering, r=pcwalton

Browse source 
Fix restyle hints to handle non-last psuedo-selectors, and track pristine state values rather than changesets

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8341)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-11-07 09:53:19 +05:30
commit 65c3185b20
9 changed files with 63 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

24
components/style/restyle_hints.rs
View file

@ -195,11 +195,10 @@ impl StateDependencySet {
StateDependencySet { deps: Vec::new() }
}
pub fn compute_hint<E>(&self, el: &E, current_state: ElementState, state_changes: ElementState)
pub fn compute_hint<E>(&self, el: &E, current_state: ElementState, old_state: ElementState)
-> RestyleHint where E: Element, E: Clone {
let mut hint = RestyleHint::empty();
let mut old_state = current_state;
old_state.toggle(state_changes);
let state_changes = current_state ^ old_state;
for dep in &self.deps {
if state_changes.intersects(dep.state) {
let old_el: ElementWrapper<E> = ElementWrapper::new_with_override(el.clone(), old_state);
@ -220,15 +219,16 @@ impl StateDependencySet {
let mut cur = selector;
let mut combinator: Option<Combinator> = None;
loop {
if let Some(rightmost) = cur.simple_selectors.last() {
let state_dep = selector_to_state(rightmost);
if !state_dep.is_empty() {
self.deps.push(StateDependency {
selector: cur.clone(),
combinator: combinator,
state: state_dep,
});
}
let mut deps = ElementState::empty();
for s in &cur.simple_selectors {
deps.insert(selector_to_state(s));
}
if !deps.is_empty() {
self.deps.push(StateDependency {
selector: cur.clone(),
combinator: combinator,
state: deps,
});
}
cur = match cur.next {

4
components/style/selector_matching.rs
View file

@ -174,10 +174,10 @@ impl Stylist {
pub fn restyle_hint_for_state_change<E>(&self, element: &E,
current_state: ElementState,
state_change: ElementState)
old_state: ElementState)
-> RestyleHint
where E: Element + Clone {
self.state_deps.compute_hint(element, current_state, state_change)
self.state_deps.compute_hint(element, current_state, old_state)
}
pub fn set_device(&mut self, device: Device) {