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

Auto merge of #19517 - mbrubeck:uluru, r=emilio

Browse source 
Defend against bugs in SelectorFlagsMap

Some defensive programming:

* Make `SelectorFlagsMap::apply_flags` private so it's easier to ensure it is called from the correct thread.

* Clear the cache and the map at the same time; otherwise `apply_flags` leaves `SelectorFlagsMap` in an inconsistent state.

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes do not require tests because they do not change behavior

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/19517)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-12-07 19:09:07 -06:00 • committed by GitHub
commit 254bbf50a7
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/style/context.rs
View file

@ -553,8 +553,9 @@ impl<E: TElement> SelectorFlagsMap<E> {
} }
/// Applies the flags. Must be called on the main thread. /// Applies the flags. Must be called on the main thread.
pub fn apply_flags(&mut self) { fn apply_flags(&mut self) {
debug_assert!(thread_state::get() == ThreadState::LAYOUT); debug_assert!(thread_state::get() == ThreadState::LAYOUT);
self.cache.evict_all();
for (el, flags) in self.map.drain() { for (el, flags) in self.map.drain() {
unsafe { el.set_selector_flags(flags); } unsafe { el.set_selector_flags(flags); }
} }