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

Update rust-selectors

Browse source 
Update for https://github.com/servo/rust-selectors/pull/37
This commit is contained in:
Simon Sapin 2015-07-17 18:18:39 +02:00
parent 0d7744b198
commit 055a1c5cee
18 changed files with 171 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

24
components/layout/css/matching.rs
View file

@ -17,7 +17,7 @@ use wrapper::{LayoutElement, LayoutNode};
use script::dom::characterdata::CharacterDataTypeId;
use script::dom::node::NodeTypeId;
use script::layout_interface::Animation;
use selectors::{Node, Element};
use selectors::{Element};
use selectors::bloom::BloomFilter;
use selectors::matching::{CommonStyleAffectingAttributeMode, CommonStyleAffectingAttributes};
use selectors::matching::{common_style_affecting_attributes, rare_style_affecting_attributes};
@ -222,18 +222,14 @@ impl StyleSharingCandidate {
/// Attempts to create a style sharing candidate from this node. Returns
/// the style sharing candidate or `None` if this node is ineligible for
/// style sharing.
fn new(node: &LayoutNode) -> Option<StyleSharingCandidate> {
let parent_node = match node.parent_node() {
fn new(element: &LayoutElement) -> Option<StyleSharingCandidate> {
let parent_element = match element.parent_element() {
None => return None,
Some(parent_node) => parent_node,
};
let element = match parent_node.as_element() {
Some(element) => element,
None => return None
Some(parent_element) => parent_element,
};
let style = unsafe {
match *node.borrow_layout_data_unchecked() {
match *element.as_node().borrow_layout_data_unchecked() {
None => return None,
Some(ref layout_data_ref) => {
match layout_data_ref.shared_data.style {
@ -244,7 +240,7 @@ impl StyleSharingCandidate {
}
};
let parent_style = unsafe {
match *parent_node.borrow_layout_data_unchecked() {
match *parent_element.as_node().borrow_layout_data_unchecked() {
None => return None,
Some(ref parent_layout_data_ref) => {
match parent_layout_data_ref.shared_data.style {
@ -357,8 +353,8 @@ impl StyleSharingCandidateCache {
self.cache.iter()
}
pub fn insert_if_possible(&mut self, node: &LayoutNode) {
match StyleSharingCandidate::new(node) {
pub fn insert_if_possible(&mut self, element: &LayoutElement) {
match StyleSharingCandidate::new(element) {
None => {}
Some(candidate) => self.cache.insert(candidate, ())
}
@ -395,7 +391,7 @@ pub trait MatchMethods {
fn match_node(&self,
stylist: &Stylist,
parent_bf: &Option<Box<BloomFilter>>,
parent_bf: Option<&BloomFilter>,
applicable_declarations: &mut ApplicableDeclarations,
shareable: &mut bool);
@ -540,7 +536,7 @@ impl<'ln> PrivateMatchMethods for LayoutNode<'ln> {
impl<'ln> MatchMethods for LayoutNode<'ln> {
fn match_node(&self,
stylist: &Stylist,
parent_bf: &Option<Box<BloomFilter>>,
parent_bf: Option<&BloomFilter>,
applicable_declarations: &mut ApplicableDeclarations,
shareable: &mut bool) {
let element = self.as_element().unwrap();