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

Add an extra lifetime parameter to TElement / TNode

Browse source 
This isn't used for anything yet, but it's easier to propagate this
change in a separate commit.
This commit is contained in:
Cameron Zwarich 2014-09-26 20:10:14 -07:00
parent a2220f1ea4
commit 61ae80e186
5 changed files with 33 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/layout/wrapper.rs
View file

@ -242,7 +242,7 @@ impl<'ln> LayoutNode<'ln> {
} }
} }
impl<'ln> TNode<LayoutElement<'ln>> for LayoutNode<'ln> { impl<'ln> TNode<'ln, LayoutElement<'ln>> for LayoutNode<'ln> {
fn parent_node(&self) -> Option<LayoutNode<'ln>> { fn parent_node(&self) -> Option<LayoutNode<'ln>> {
unsafe { unsafe {
self.node.parent_node_ref().map(|node| self.new_with_this_lifetime(&node)) self.node.parent_node_ref().map(|node| self.new_with_this_lifetime(&node))
@ -389,7 +389,7 @@ impl<'le> LayoutElement<'le> {
} }
} }
impl<'le> TElement for LayoutElement<'le> { impl<'le> TElement<'le> for LayoutElement<'le> {
#[inline] #[inline]
fn get_local_name<'a>(&'a self) -> &'a Atom { fn get_local_name<'a>(&'a self) -> &'a Atom {
&self.element.local_name &self.element.local_name

2
components/script/dom/element.rs
View file

@ -948,7 +948,7 @@ impl<'a> VirtualMethods for JSRef<'a, Element> {
} }
} }
impl<'a> style::TElement for JSRef<'a, Element> { impl<'a> style::TElement<'a> for JSRef<'a, Element> {
fn get_attr(&self, namespace: &Namespace, attr: &str) -> Option<&'static str> { fn get_attr(&self, namespace: &Namespace, attr: &str) -> Option<&'static str> {
self.get_attribute(namespace.clone(), attr).root().map(|attr| { self.get_attribute(namespace.clone(), attr).root().map(|attr| {
unsafe { mem::transmute(attr.deref().value().as_slice()) } unsafe { mem::transmute(attr.deref().value().as_slice()) }

2
components/script/dom/node.rs
View file

@ -2033,7 +2033,7 @@ impl<'a> VirtualMethods for JSRef<'a, Node> {
} }
} }
impl<'a> style::TNode<JSRef<'a, Element>> for JSRef<'a, Node> { impl<'a> style::TNode<'a, JSRef<'a, Element>> for JSRef<'a, Node> {
fn parent_node(&self) -> Option<JSRef<'a, Node>> { fn parent_node(&self) -> Option<JSRef<'a, Node>> {
(self as &NodeHelpers).parent_node().map(|node| *node.root()) (self as &NodeHelpers).parent_node().map(|node| *node.root())
} }

4
components/style/node.rs
View file

@ -10,7 +10,7 @@ use servo_util::atom::Atom;
use servo_util::namespace::Namespace; use servo_util::namespace::Namespace;
pub trait TNode<E:TElement> : Clone { pub trait TNode<'a, E: TElement<'a>> : Clone {
fn parent_node(&self) -> Option<Self>; fn parent_node(&self) -> Option<Self>;
/// Name is prefixed to avoid a conflict with TLayoutNode. /// Name is prefixed to avoid a conflict with TLayoutNode.
fn tnode_first_child(&self) -> Option<Self>; fn tnode_first_child(&self) -> Option<Self>;
@ -23,7 +23,7 @@ pub trait TNode<E:TElement> : Clone {
fn is_html_element_in_html_document(&self) -> bool; fn is_html_element_in_html_document(&self) -> bool;
} }
pub trait TElement { pub trait TElement<'a> {
fn get_attr(&self, namespace: &Namespace, attr: &str) -> Option<&'static str>; fn get_attr(&self, namespace: &Namespace, attr: &str) -> Option<&'static str>;
fn get_link(&self) -> Option<&'static str>; fn get_link(&self) -> Option<&'static str>;
fn get_local_name<'a>(&'a self) -> &'a Atom; fn get_local_name<'a>(&'a self) -> &'a Atom;

48
components/style/selector_matching.rs
View file

@ -79,8 +79,9 @@ impl SelectorMap {
/// ///
/// Extract matching rules as per node's ID, classes, tag name, etc.. /// Extract matching rules as per node's ID, classes, tag name, etc..
/// Sort the Rules at the end to maintain cascading order. /// Sort the Rules at the end to maintain cascading order.
fn get_all_matching_rules<E:TElement, fn get_all_matching_rules<'a,
N:TNode<E>, E:TElement<'a>,
N:TNode<'a, E>,
V:VecLike<DeclarationBlock>>( V:VecLike<DeclarationBlock>>(
&self, &self,
node: &N, node: &N,
@ -147,8 +148,9 @@ impl SelectorMap {
} }
} }
fn get_matching_rules_from_hash<E:TElement, fn get_matching_rules_from_hash<'a,
N:TNode<E>, E:TElement<'a>,
N:TNode<'a, E>,
V:VecLike<DeclarationBlock>>( V:VecLike<DeclarationBlock>>(
node: &N, node: &N,
parent_bf: &Option<BloomFilter>, parent_bf: &Option<BloomFilter>,
@ -165,8 +167,9 @@ impl SelectorMap {
} }
/// Adds rules in `rules` that match `node` to the `matching_rules` list. /// Adds rules in `rules` that match `node` to the `matching_rules` list.
fn get_matching_rules<E:TElement, fn get_matching_rules<'a,
N:TNode<E>, E:TElement<'a>,
N:TNode<'a, E>,
V:VecLike<DeclarationBlock>>( V:VecLike<DeclarationBlock>>(
node: &N, node: &N,
parent_bf: &Option<BloomFilter>, parent_bf: &Option<BloomFilter>,
@ -344,8 +347,9 @@ impl Stylist {
/// The returned boolean indicates whether the style is *shareable*; that is, whether the /// The returned boolean indicates whether the style is *shareable*; that is, whether the
/// matched selectors are simple enough to allow the matching logic to be reduced to the logic /// matched selectors are simple enough to allow the matching logic to be reduced to the logic
/// in `css::matching::PrivateMatchMethods::candidate_element_allows_for_style_sharing`. /// in `css::matching::PrivateMatchMethods::candidate_element_allows_for_style_sharing`.
pub fn push_applicable_declarations<E:TElement, pub fn push_applicable_declarations<'a,
N:TNode<E>, E:TElement<'a>,
N:TNode<'a, E>,
V:VecLike<DeclarationBlock>>( V:VecLike<DeclarationBlock>>(
&self, &self,
element: &N, element: &N,
@ -467,7 +471,7 @@ impl DeclarationBlock {
} }
} }
pub fn matches<E:TElement, N:TNode<E>>(selector_list: &SelectorList, element: &N, parent_bf: &Option<BloomFilter>) -> bool { pub fn matches<'a, E:TElement<'a>, N:TNode<'a, E>>(selector_list: &SelectorList, element: &N, parent_bf: &Option<BloomFilter>) -> bool {
get_selector_list_selectors(selector_list).iter().any(|selector| get_selector_list_selectors(selector_list).iter().any(|selector|
selector.pseudo_element.is_none() && selector.pseudo_element.is_none() &&
matches_compound_selector(&*selector.compound_selectors, element, parent_bf, &mut false)) matches_compound_selector(&*selector.compound_selectors, element, parent_bf, &mut false))
@ -479,8 +483,9 @@ pub fn matches<E:TElement, N:TNode<E>>(selector_list: &SelectorList, element: &N
/// `shareable` to false unless you are willing to update the style sharing logic. Otherwise things /// `shareable` to false unless you are willing to update the style sharing logic. Otherwise things
/// will almost certainly break as nodes will start mistakenly sharing styles. (See the code in /// will almost certainly break as nodes will start mistakenly sharing styles. (See the code in
/// `main/css/matching.rs`.) /// `main/css/matching.rs`.)
fn matches_compound_selector<E:TElement, fn matches_compound_selector<'a,
N:TNode<E>>( E:TElement<'a>,
N:TNode<'a, E>>(
selector: &CompoundSelector, selector: &CompoundSelector,
element: &N, element: &N,
parent_bf: &Option<BloomFilter>, parent_bf: &Option<BloomFilter>,
@ -544,7 +549,7 @@ enum SelectorMatchingResult {
/// Quickly figures out whether or not the compound selector is worth doing more /// Quickly figures out whether or not the compound selector is worth doing more
/// work on. If the simple selectors don't match, or there's a child selector /// work on. If the simple selectors don't match, or there's a child selector
/// that does not appear in the bloom parent bloom filter, we can exit early. /// that does not appear in the bloom parent bloom filter, we can exit early.
fn can_fast_reject<E: TElement, N: TNode<E>>( fn can_fast_reject<'a, E: TElement<'a>, N: TNode<'a, E>>(
mut selector: &CompoundSelector, mut selector: &CompoundSelector,
element: &N, element: &N,
parent_bf: &Option<BloomFilter>, parent_bf: &Option<BloomFilter>,
@ -605,8 +610,9 @@ fn can_fast_reject<E: TElement, N: TNode<E>>(
return None; return None;
} }
fn matches_compound_selector_internal<E:TElement, fn matches_compound_selector_internal<'a,
N:TNode<E>>( E:TElement<'a>,
N:TNode<'a, E>>(
selector: &CompoundSelector, selector: &CompoundSelector,
element: &N, element: &N,
parent_bf: &Option<BloomFilter>, parent_bf: &Option<BloomFilter>,
@ -680,8 +686,8 @@ fn matches_compound_selector_internal<E:TElement,
/// will almost certainly break as nodes will start mistakenly sharing styles. (See the code in /// will almost certainly break as nodes will start mistakenly sharing styles. (See the code in
/// `main/css/matching.rs`.) /// `main/css/matching.rs`.)
#[inline] #[inline]
pub fn matches_simple_selector<E:TElement, pub fn matches_simple_selector<'a, E:TElement<'a>,
N:TNode<E>>( N:TNode<'a, E>>(
selector: &SimpleSelector, selector: &SimpleSelector,
element: &N, element: &N,
shareable: &mut bool) shareable: &mut bool)
@ -863,8 +869,8 @@ fn url_is_visited(_url: &str) -> bool {
#[inline] #[inline]
fn matches_generic_nth_child<'a, fn matches_generic_nth_child<'a,
E:TElement, E:TElement<'a>,
N:TNode<E>>( N:TNode<'a, E>>(
element: &N, element: &N,
a: i32, a: i32,
b: i32, b: i32,
@ -919,7 +925,7 @@ fn matches_generic_nth_child<'a,
} }
#[inline] #[inline]
fn matches_root<E:TElement,N:TNode<E>>(element: &N) -> bool { fn matches_root<'a, E:TElement<'a>,N:TNode<'a, E>>(element: &N) -> bool {
match element.parent_node() { match element.parent_node() {
Some(parent) => parent.is_document(), Some(parent) => parent.is_document(),
None => false None => false
@ -927,7 +933,7 @@ fn matches_root<E:TElement,N:TNode<E>>(element: &N) -> bool {
} }
#[inline] #[inline]
fn matches_first_child<E:TElement,N:TNode<E>>(element: &N) -> bool { fn matches_first_child<'a, E:TElement<'a>,N:TNode<'a, E>>(element: &N) -> bool {
let mut node = element.clone(); let mut node = element.clone();
loop { loop {
match node.prev_sibling() { match node.prev_sibling() {
@ -949,7 +955,7 @@ fn matches_first_child<E:TElement,N:TNode<E>>(element: &N) -> bool {
} }
#[inline] #[inline]
fn matches_last_child<E:TElement,N:TNode<E>>(element: &N) -> bool { fn matches_last_child<'a, E:TElement<'a>,N:TNode<'a, E>>(element: &N) -> bool {
let mut node = element.clone(); let mut node = element.clone();
loop { loop {
match node.next_sibling() { match node.next_sibling() {