diff options
Diffstat (limited to 'components/script_layout_interface')
| -rw-r--r-- | components/script_layout_interface/message.rs | 4 | ||||
| -rw-r--r-- | components/script_layout_interface/rpc.rs | 2 | ||||
| -rw-r--r-- | components/script_layout_interface/wrapper_traits.rs | 28 |
3 files changed, 17 insertions, 17 deletions
diff --git a/components/script_layout_interface/message.rs b/components/script_layout_interface/message.rs index 581adbb45bc..3d0e00c46cc 100644 --- a/components/script_layout_interface/message.rs +++ b/components/script_layout_interface/message.rs @@ -14,11 +14,11 @@ use profile_traits::mem::ReportsChan; use rpc::LayoutRPC; use script_traits::{ConstellationControlMsg, LayoutControlMsg}; use script_traits::{LayoutMsg as ConstellationMsg, StackingContextScrollState, WindowSizeData}; -use servo_atoms::Atom; use servo_url::ServoUrl; use std::sync::Arc; use std::sync::mpsc::{Receiver, Sender}; use style::context::ReflowGoal; +use style::properties::PropertyId; use style::selector_parser::PseudoElement; use style::stylesheets::Stylesheet; @@ -97,7 +97,7 @@ pub enum ReflowQueryType { NodeScrollRootIdQuery(TrustedNodeAddress), NodeGeometryQuery(TrustedNodeAddress), NodeScrollGeometryQuery(TrustedNodeAddress), - ResolvedStyleQuery(TrustedNodeAddress, Option<PseudoElement>, Atom), + ResolvedStyleQuery(TrustedNodeAddress, Option<PseudoElement>, PropertyId), OffsetParentQuery(TrustedNodeAddress), MarginStyleQuery(TrustedNodeAddress), } diff --git a/components/script_layout_interface/rpc.rs b/components/script_layout_interface/rpc.rs index 6e19b3f3bcf..7bc58dbf334 100644 --- a/components/script_layout_interface/rpc.rs +++ b/components/script_layout_interface/rpc.rs @@ -57,7 +57,7 @@ pub struct HitTestResponse { pub node_address: Option<UntrustedNodeAddress>, } -pub struct ResolvedStyleResponse(pub Option<String>); +pub struct ResolvedStyleResponse(pub String); #[derive(Clone)] pub struct OffsetParentResponse { diff --git a/components/script_layout_interface/wrapper_traits.rs b/components/script_layout_interface/wrapper_traits.rs index cf3e3e4c7c5..e141cb581c3 100644 --- a/components/script_layout_interface/wrapper_traits.rs +++ b/components/script_layout_interface/wrapper_traits.rs @@ -319,7 +319,7 @@ pub trait ThreadSafeLayoutElement: Clone + Copy + Sized + Debug + if self.get_style_data() .unwrap() .borrow() - .current_styles().pseudos + .styles().pseudos .contains_key(&PseudoElement::Before) { Some(self.with_pseudo(PseudoElementType::Before(None))) } else { @@ -332,7 +332,7 @@ pub trait ThreadSafeLayoutElement: Clone + Copy + Sized + Debug + if self.get_style_data() .unwrap() .borrow() - .current_styles().pseudos + .styles().pseudos .contains_key(&PseudoElement::After) { Some(self.with_pseudo(PseudoElementType::After(None))) } else { @@ -373,7 +373,7 @@ pub trait ThreadSafeLayoutElement: Clone + Copy + Sized + Debug + fn style(&self, context: &SharedStyleContext) -> Arc<ServoComputedValues> { match self.get_pseudo_element_type() { PseudoElementType::Normal => self.get_style_data().unwrap().borrow() - .current_styles().primary.values.clone(), + .styles().primary.values.clone(), other => { // Precompute non-eagerly-cascaded pseudo-element styles if not // cached before. @@ -385,14 +385,14 @@ pub trait ThreadSafeLayoutElement: Clone + Copy + Sized + Debug + if !self.get_style_data() .unwrap() .borrow() - .current_styles().pseudos.contains_key(&style_pseudo) { + .styles().pseudos.contains_key(&style_pseudo) { let mut data = self.get_style_data().unwrap().borrow_mut(); let new_style = context.stylist.precomputed_values_for_pseudo( &style_pseudo, - Some(&data.current_styles().primary.values), + Some(&data.styles().primary.values), false); - data.current_styles_mut().pseudos + data.styles_mut().pseudos .insert(style_pseudo.clone(), new_style.unwrap()); } } @@ -400,22 +400,22 @@ pub trait ThreadSafeLayoutElement: Clone + Copy + Sized + Debug + if !self.get_style_data() .unwrap() .borrow() - .current_styles().pseudos.contains_key(&style_pseudo) { + .styles().pseudos.contains_key(&style_pseudo) { let mut data = self.get_style_data().unwrap().borrow_mut(); let new_style = context.stylist .lazily_compute_pseudo_element_style( self, &style_pseudo, - &data.current_styles().primary.values); - data.current_styles_mut().pseudos + &data.styles().primary.values); + data.styles_mut().pseudos .insert(style_pseudo.clone(), new_style.unwrap()); } } } self.get_style_data().unwrap().borrow() - .current_styles().pseudos.get(&style_pseudo) + .styles().pseudos.get(&style_pseudo) .unwrap().values.clone() } } @@ -424,9 +424,9 @@ pub trait ThreadSafeLayoutElement: Clone + Copy + Sized + Debug + #[inline] fn selected_style(&self) -> Arc<ServoComputedValues> { let data = self.get_style_data().unwrap().borrow(); - data.current_styles().pseudos + data.styles().pseudos .get(&PseudoElement::Selection).map(|s| s) - .unwrap_or(&data.current_styles().primary) + .unwrap_or(&data.styles().primary) .values.clone() } @@ -442,9 +442,9 @@ pub trait ThreadSafeLayoutElement: Clone + Copy + Sized + Debug + let data = self.get_style_data().unwrap().borrow(); match self.get_pseudo_element_type() { PseudoElementType::Normal - => data.current_styles().primary.values.clone(), + => data.styles().primary.values.clone(), other - => data.current_styles().pseudos + => data.styles().pseudos .get(&other.style_pseudo_element()).unwrap().values.clone(), } } |