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

Change device and rule_set references to accessors

Browse source
This commit is contained in:
heyzoos 2017-05-18 22:18:16 -05:00
parent 0ad0641872
commit 4196156bb9
7 changed files with 37 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/layout_thread/lib.rs
View file

@ -457,7 +457,7 @@ impl LayoutThread {
for stylesheet in &ua_stylesheets.user_or_user_agent_stylesheets { for stylesheet in &ua_stylesheets.user_or_user_agent_stylesheets {
add_font_face_rules(stylesheet, add_font_face_rules(stylesheet,
&guard, &guard,
&stylist.device, stylist.device(),
&font_cache_thread, &font_cache_thread,
&ipc_font_cache_sender, &ipc_font_cache_sender,
&outstanding_web_fonts_counter); &outstanding_web_fonts_counter);
@ -789,10 +789,10 @@ impl LayoutThread {
let rw_data = possibly_locked_rw_data.lock(); let rw_data = possibly_locked_rw_data.lock();
let guard = stylesheet.shared_lock.read(); let guard = stylesheet.shared_lock.read();
if stylesheet.is_effective_for_device(&self.stylist.device, &guard) { if stylesheet.is_effective_for_device(self.stylist.device(), &guard) {
add_font_face_rules(&*stylesheet, add_font_face_rules(&*stylesheet,
&guard, &guard,
&self.stylist.device, self.stylist.device(),
&self.font_cache_thread, &self.font_cache_thread,
&self.font_cache_sender, &self.font_cache_sender,
&self.outstanding_web_fonts); &self.outstanding_web_fonts);
@ -1255,11 +1255,11 @@ impl LayoutThread {
} }
if opts::get().dump_rule_tree { if opts::get().dump_rule_tree {
layout_context.style_context.stylist.rule_tree.dump_stdout(&guards); layout_context.style_context.stylist.rule_tree().dump_stdout(&guards);
} }
// GC the rule tree if some heuristics are met. // GC the rule tree if some heuristics are met.
unsafe { layout_context.style_context.stylist.rule_tree.maybe_gc(); } unsafe { layout_context.style_context.stylist.rule_tree().maybe_gc(); }
// Perform post-style recalculation layout passes. // Perform post-style recalculation layout passes.
if let Some(mut root_flow) = self.root_flow.borrow().clone() { if let Some(mut root_flow) = self.root_flow.borrow().clone() {

2
components/style/animation.rs
View file

@ -476,7 +476,7 @@ fn compute_style_for_animation_step(context: &SharedStyleContext,
}; };
let computed = let computed =
properties::apply_declarations(&context.stylist.device, properties::apply_declarations(context.stylist.device(),
/* is_root = */ false, /* is_root = */ false,
iter, iter,
previous_style, previous_style,

2
components/style/context.rs
View file

@ -150,7 +150,7 @@ pub struct SharedStyleContext<'a> {
impl<'a> SharedStyleContext<'a> { impl<'a> SharedStyleContext<'a> {
/// Return a suitable viewport size in order to be used for viewport units. /// Return a suitable viewport size in order to be used for viewport units.
pub fn viewport_size(&self) -> Size2D<Au> { pub fn viewport_size(&self) -> Size2D<Au> {
self.stylist.device.au_viewport_size() self.stylist.device().au_viewport_size()
} }
} }

4
components/style/gecko/data.rs
View file

@ -95,7 +95,7 @@ impl PerDocumentStyleDataImpl {
/// ///
/// Implies also a stylesheet flush. /// Implies also a stylesheet flush.
pub fn reset_device(&mut self, guard: &SharedRwLockReadGuard) { pub fn reset_device(&mut self, guard: &SharedRwLockReadGuard) {
Arc::get_mut(&mut self.stylist.device).unwrap().reset(); Arc::get_mut(self.stylist.device_mut()).unwrap().reset();
self.stylesheets.force_dirty(); self.stylesheets.force_dirty();
self.flush_stylesheets(guard); self.flush_stylesheets(guard);
} }
@ -123,7 +123,7 @@ impl PerDocumentStyleDataImpl {
/// Get the default computed values for this document. /// Get the default computed values for this document.
pub fn default_computed_values(&self) -> &Arc<ComputedValues> { pub fn default_computed_values(&self) -> &Arc<ComputedValues> {
self.stylist.device.default_computed_values_arc() self.stylist.device().default_computed_values_arc()
} }
/// Clear the stylist. This will be a no-op if the stylist is /// Clear the stylist. This will be a no-op if the stylist is

16
components/style/matching.rs
View file

@ -476,7 +476,7 @@ trait PrivateMatchMethods: TElement {
// Invoke the cascade algorithm. // Invoke the cascade algorithm.
let values = let values =
Arc::new(cascade(&shared_context.stylist.device, Arc::new(cascade(shared_context.stylist.device(),
rule_node, rule_node,
&shared_context.guards, &shared_context.guards,
style_to_inherit_from, style_to_inherit_from,
@ -603,7 +603,7 @@ trait PrivateMatchMethods: TElement {
-> Option<Arc<ComputedValues>> { -> Option<Arc<ComputedValues>> {
let rule_node = &primary_style.rules; let rule_node = &primary_style.rules;
let without_transition_rules = let without_transition_rules =
context.shared.stylist.rule_tree.remove_transition_rule_if_applicable(rule_node); context.shared.stylist.rule_tree().remove_transition_rule_if_applicable(rule_node);
if without_transition_rules == *rule_node { if without_transition_rules == *rule_node {
// We don't have transition rule in this case, so return None to let the caller // We don't have transition rule in this case, so return None to let the caller
// use the original ComputedValues. // use the original ComputedValues.
@ -955,7 +955,7 @@ pub trait MatchMethods : TElement {
// Handle animations here. // Handle animations here.
if let Some(animation_rule) = animation_rules.0 { if let Some(animation_rule) = animation_rules.0 {
let animation_rule_node = let animation_rule_node =
context.shared.stylist.rule_tree context.shared.stylist.rule_tree()
.update_rule_at_level(CascadeLevel::Animations, .update_rule_at_level(CascadeLevel::Animations,
Some(&animation_rule), Some(&animation_rule),
&mut rules, &mut rules,
@ -967,7 +967,7 @@ pub trait MatchMethods : TElement {
if let Some(animation_rule) = animation_rules.1 { if let Some(animation_rule) = animation_rules.1 {
let animation_rule_node = let animation_rule_node =
context.shared.stylist.rule_tree context.shared.stylist.rule_tree()
.update_rule_at_level(CascadeLevel::Transitions, .update_rule_at_level(CascadeLevel::Transitions,
Some(&animation_rule), Some(&animation_rule),
&mut rules, &mut rules,
@ -1011,7 +1011,7 @@ pub trait MatchMethods : TElement {
*relations = matching_context.relations; *relations = matching_context.relations;
let primary_rule_node = let primary_rule_node =
compute_rule_node::<Self>(&stylist.rule_tree, compute_rule_node::<Self>(stylist.rule_tree(),
&mut applicable_declarations, &mut applicable_declarations,
&context.shared.guards); &context.shared.guards);
@ -1044,7 +1044,7 @@ pub trait MatchMethods : TElement {
// at us later in the closure. // at us later in the closure.
let stylist = &context.shared.stylist; let stylist = &context.shared.stylist;
let guards = &context.shared.guards; let guards = &context.shared.guards;
let rule_tree = &stylist.rule_tree; let rule_tree = stylist.rule_tree();
let bloom_filter = context.thread_local.bloom_filter.filter(); let bloom_filter = context.thread_local.bloom_filter.filter();
let mut matching_context = let mut matching_context =
@ -1172,7 +1172,7 @@ pub trait MatchMethods : TElement {
let mut replace_rule_node = |level: CascadeLevel, let mut replace_rule_node = |level: CascadeLevel,
pdb: Option<&Arc<Locked<PropertyDeclarationBlock>>>, pdb: Option<&Arc<Locked<PropertyDeclarationBlock>>>,
path: &mut StrongRuleNode| { path: &mut StrongRuleNode| {
let new_node = context.shared.stylist.rule_tree let new_node = context.shared.stylist.rule_tree()
.update_rule_at_level(level, pdb, path, &context.shared.guards); .update_rule_at_level(level, pdb, path, &context.shared.guards);
if let Some(n) = new_node { if let Some(n) = new_node {
*path = n; *path = n;
@ -1430,7 +1430,7 @@ pub trait MatchMethods : TElement {
let relevant_style = pseudo_style.unwrap_or(primary_style); let relevant_style = pseudo_style.unwrap_or(primary_style);
let rule_node = &relevant_style.rules; let rule_node = &relevant_style.rules;
let without_animation_rules = let without_animation_rules =
shared_context.stylist.rule_tree.remove_animation_rules(rule_node); shared_context.stylist.rule_tree().remove_animation_rules(rule_node);
if without_animation_rules == *rule_node { if without_animation_rules == *rule_node {
// Note that unwrapping here is fine, because the style is // Note that unwrapping here is fine, because the style is
// only incomplete during the styling process. // only incomplete during the styling process.

19
components/style/stylist.rs
View file

@ -88,7 +88,7 @@ pub struct Stylist {
/// ///
/// In both cases, the device is actually _owned_ by the Stylist, and it's /// In both cases, the device is actually _owned_ by the Stylist, and it's
/// only an `Arc` so we can implement `add_stylesheet` more idiomatically. /// only an `Arc` so we can implement `add_stylesheet` more idiomatically.
pub device: Arc<Device>, device: Arc<Device>,
/// Viewport constraints based on the current device. /// Viewport constraints based on the current device.
viewport_constraints: Option<ViewportConstraints>, viewport_constraints: Option<ViewportConstraints>,
@ -110,7 +110,7 @@ pub struct Stylist {
/// The rule tree, that stores the results of selector matching. /// The rule tree, that stores the results of selector matching.
/// ///
/// FIXME(emilio): Not `pub`! /// FIXME(emilio): Not `pub`!
pub rule_tree: RuleTree, rule_tree: RuleTree,
/// The selector maps corresponding to a given pseudo-element /// The selector maps corresponding to a given pseudo-element
/// (depending on the implementation) /// (depending on the implementation)
@ -1065,6 +1065,21 @@ impl Stylist {
CascadeFlags::empty(), CascadeFlags::empty(),
self.quirks_mode)) self.quirks_mode))
} }
/// Accessor for a shared reference to the device.
pub fn device(&self) -> &Arc<Device> {
&self.device
}
/// Accessor for a mutable reference to the device.
pub fn device_mut(&mut self) -> &mut Arc<Device> {
&mut self.device
}
/// Accessor for a shared reference to the rule tree.
pub fn rule_tree(&self) -> &RuleTree {
&self.rule_tree
}
} }
impl Drop for Stylist { impl Drop for Stylist {

6
ports/geckolib/glue.rs
View file

@ -1390,7 +1390,7 @@ pub extern "C" fn Servo_MediaList_Matches(list: RawServoMediaListBorrowed,
-> bool { -> bool {
let per_doc_data = PerDocumentStyleData::from_ffi(raw_data).borrow(); let per_doc_data = PerDocumentStyleData::from_ffi(raw_data).borrow();
read_locked_arc(list, |list: &MediaList| { read_locked_arc(list, |list: &MediaList| {
list.evaluate(&per_doc_data.stylist.device, per_doc_data.stylist.quirks_mode()) list.evaluate(per_doc_data.stylist.device(), per_doc_data.stylist.quirks_mode())
}) })
} }
@ -2074,7 +2074,7 @@ pub extern "C" fn Servo_GetComputedKeyframeValues(keyframes: RawGeckoKeyframeLis
let mut context = Context { let mut context = Context {
is_root_element: false, is_root_element: false,
device: &data.stylist.device, device: data.stylist.device(),
inherited_style: parent_style.unwrap_or(default_values), inherited_style: parent_style.unwrap_or(default_values),
layout_parent_style: parent_style.unwrap_or(default_values), layout_parent_style: parent_style.unwrap_or(default_values),
style: StyleBuilder::for_derived_style(&style), style: StyleBuilder::for_derived_style(&style),
@ -2152,7 +2152,7 @@ pub extern "C" fn Servo_AnimationValue_Compute(declarations: RawServoDeclaration
let metrics = get_metrics_provider_for_product(); let metrics = get_metrics_provider_for_product();
let mut context = Context { let mut context = Context {
is_root_element: false, is_root_element: false,
device: &data.stylist.device, device: data.stylist.device(),
inherited_style: parent_style.unwrap_or(default_values), inherited_style: parent_style.unwrap_or(default_values),
layout_parent_style: parent_style.unwrap_or(default_values), layout_parent_style: parent_style.unwrap_or(default_values),
style: StyleBuilder::for_derived_style(&style), style: StyleBuilder::for_derived_style(&style),