aboutsummaryrefslogtreecommitdiffstats
path: root/components/script_layout_interface/wrapper_traits.rs
diff options
context:
space:
mode:
authorEmilio Cobos Álvarez <emilio@crisal.io>2017-12-05 22:13:50 +0100
committerEmilio Cobos Álvarez <emilio@crisal.io>2017-12-06 02:35:10 +0100
commitaf879523eabbdb72b672aab50da1f83bb782ed1e (patch)
tree4071fb814c411a6c2fd52192d0994bd4861af94d /components/script_layout_interface/wrapper_traits.rs
parent37cd870a9e41fe6e6ba12e0622f2e2a935fda89a (diff)
downloadservo-af879523eabbdb72b672aab50da1f83bb782ed1e.tar.gz
servo-af879523eabbdb72b672aab50da1f83bb782ed1e.zip
style: Make all keywords CamelCase for consistency.
This prevents confusion and paves the ground for derive(Parse) of them.
Diffstat (limited to 'components/script_layout_interface/wrapper_traits.rs')
-rw-r--r--components/script_layout_interface/wrapper_traits.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/components/script_layout_interface/wrapper_traits.rs b/components/script_layout_interface/wrapper_traits.rs
index d18da7b4f01..49f157f9158 100644
--- a/components/script_layout_interface/wrapper_traits.rs
+++ b/components/script_layout_interface/wrapper_traits.rs
@@ -17,7 +17,7 @@ use servo_arc::Arc;
use servo_url::ServoUrl;
use std::fmt::Debug;
use style::attr::AttrValue;
-use style::computed_values::display;
+use style::computed_values::display::T as Display;
use style::context::SharedStyleContext;
use style::data::ElementData;
use style::dom::{LayoutIterator, NodeInfo, TNode};
@@ -197,7 +197,7 @@ pub trait ThreadSafeLayoutNode: Clone + Copy + Debug + GetLayoutData + NodeInfo
fn as_element(&self) -> Option<Self::ConcreteThreadSafeLayoutElement>;
#[inline]
- fn get_pseudo_element_type(&self) -> PseudoElementType<Option<display::T>> {
+ fn get_pseudo_element_type(&self) -> PseudoElementType<Option<Display>> {
self.as_element().map_or(PseudoElementType::Normal, |el| el.get_pseudo_element_type())
}
@@ -304,7 +304,7 @@ pub trait ThreadSafeLayoutElement
/// Creates a new `ThreadSafeLayoutElement` for the same `LayoutElement`
/// with a different pseudo-element type.
- fn with_pseudo(&self, pseudo: PseudoElementType<Option<display::T>>) -> Self;
+ fn with_pseudo(&self, pseudo: PseudoElementType<Option<Display>>) -> Self;
/// Returns the type ID of this node.
/// Returns `None` if this is a pseudo-element; otherwise, returns `Some`.
@@ -327,7 +327,7 @@ pub trait ThreadSafeLayoutElement
fn style_data(&self) -> AtomicRef<ElementData>;
#[inline]
- fn get_pseudo_element_type(&self) -> PseudoElementType<Option<display::T>>;
+ fn get_pseudo_element_type(&self) -> PseudoElementType<Option<Display>>;
#[inline]
fn get_before_pseudo(&self) -> Option<Self> {
@@ -364,7 +364,7 @@ pub trait ThreadSafeLayoutElement
let display = if self.get_attr(&ns!(), &local_name!("open")).is_some() {
None // Specified by the stylesheet
} else {
- Some(display::T::none)
+ Some(Display::None)
};
Some(self.with_pseudo(PseudoElementType::DetailsContent(display)))
} else {