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

style: Store the quirks mode directly in InvalidationCollector.

Browse source
This commit is contained in:
Emilio Cobos Álvarez 2017-10-11 11:10:39 +02:00
parent b1c7a2fa6d
commit bb6ff9575d
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
components/style/invalidation/element/invalidator.rs
View file

@ -6,7 +6,7 @@
//! element styles need to be invalidated. //! element styles need to be invalidated.
use Atom; use Atom;
use context::{SharedStyleContext, StackLimitChecker}; use context::{QuirksMode, SharedStyleContext, StackLimitChecker};
use data::ElementData; use data::ElementData;
use dom::{TElement, TNode}; use dom::{TElement, TNode};
use element_state::{ElementState, IN_VISITED_OR_UNVISITED_STATE}; use element_state::{ElementState, IN_VISITED_OR_UNVISITED_STATE};
@ -262,7 +262,7 @@ impl<'a, 'b: 'a, E> TreeStyleInvalidator<'a, 'b, E>
state_changes, state_changes,
element: self.element, element: self.element,
snapshot: &snapshot, snapshot: &snapshot,
shared_context: self.shared_context, quirks_mode: self.shared_context.quirks_mode(),
removed_id: id_removed.as_ref(), removed_id: id_removed.as_ref(),
added_id: id_added.as_ref(), added_id: id_added.as_ref(),
classes_removed: &classes_removed, classes_removed: &classes_removed,
@ -823,7 +823,7 @@ struct InvalidationCollector<'a, 'b: 'a, E>
wrapper: ElementWrapper<'b, E>, wrapper: ElementWrapper<'b, E>,
nth_index_cache: Option<&'a mut NthIndexCache>, nth_index_cache: Option<&'a mut NthIndexCache>,
snapshot: &'a Snapshot, snapshot: &'a Snapshot,
shared_context: &'a SharedStyleContext<'b>, quirks_mode: QuirksMode,
lookup_element: E, lookup_element: E,
removed_id: Option<&'a Atom>, removed_id: Option<&'a Atom>,
added_id: Option<&'a Atom>, added_id: Option<&'a Atom>,
@ -842,7 +842,7 @@ impl<'a, 'b: 'a, E> InvalidationCollector<'a, 'b, E>
&mut self, &mut self,
map: &InvalidationMap, map: &InvalidationMap,
) { ) {
let quirks_mode = self.shared_context.quirks_mode(); let quirks_mode = self.quirks_mode;
let removed_id = self.removed_id; let removed_id = self.removed_id;
if let Some(ref id) = removed_id { if let Some(ref id) = removed_id {
if let Some(deps) = map.id_to_selector.get(id, quirks_mode) { if let Some(deps) = map.id_to_selector.get(id, quirks_mode) {
@ -895,7 +895,7 @@ impl<'a, 'b: 'a, E> InvalidationCollector<'a, 'b, E>
) { ) {
map.lookup_with_additional( map.lookup_with_additional(
self.lookup_element, self.lookup_element,
self.shared_context.quirks_mode(), self.quirks_mode,
self.removed_id, self.removed_id,
self.classes_removed, self.classes_removed,
&mut |dependency| { &mut |dependency| {
@ -912,7 +912,7 @@ impl<'a, 'b: 'a, E> InvalidationCollector<'a, 'b, E>
) { ) {
map.lookup_with_additional( map.lookup_with_additional(
self.lookup_element, self.lookup_element,
self.shared_context.quirks_mode(), self.quirks_mode,
self.removed_id, self.removed_id,
self.classes_removed, self.classes_removed,
&mut |dependency| { &mut |dependency| {
@ -945,7 +945,7 @@ impl<'a, 'b: 'a, E> InvalidationCollector<'a, 'b, E>
None, None,
self.nth_index_cache.as_mut().map(|c| &mut **c), self.nth_index_cache.as_mut().map(|c| &mut **c),
visited_handling_mode, visited_handling_mode,
self.shared_context.quirks_mode(), self.quirks_mode,
); );
let matches_now = matches_selector( let matches_now = matches_selector(
@ -966,7 +966,7 @@ impl<'a, 'b: 'a, E> InvalidationCollector<'a, 'b, E>
None, None,
self.nth_index_cache.as_mut().map(|c| &mut **c), self.nth_index_cache.as_mut().map(|c| &mut **c),
visited_handling_mode, visited_handling_mode,
self.shared_context.quirks_mode(), self.quirks_mode,
); );
let matched_then = matches_selector( let matched_then = matches_selector(