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

style: Atomize animation names.

Browse source
This commit is contained in:
Emilio Cobos Álvarez 2016-06-19 16:51:02 +02:00
parent 0077eb147c
commit 5b27e46d04
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
4 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/style/animation.rs
View file

@ -235,7 +235,7 @@ pub fn maybe_start_animations<Impl: SelectorImplExt>(context: &SharedStyleContex
} }
// TODO: This should be factored out, too much indentation. // TODO: This should be factored out, too much indentation.
if let Some(ref animation) = context.stylist.animations().get(&**name) { if let Some(ref animation) = context.stylist.animations().get(&name) {
debug!("maybe_start_animations: found animation {}", name); debug!("maybe_start_animations: found animation {}", name);
had_animations = true; had_animations = true;
let mut last_keyframe_style = compute_style_for_animation_step(context, let mut last_keyframe_style = compute_style_for_animation_step(context,

8
components/style/properties/longhand/box.mako.rs
View file

@ -589,9 +589,10 @@ ${helpers.single_keyword("overflow-x", "visible hidden scroll auto", need_clone=
pub mod computed_value { pub mod computed_value {
use cssparser::ToCss; use cssparser::ToCss;
use std::fmt; use std::fmt;
use string_cache::Atom;
#[derive(Debug, Clone, PartialEq, HeapSizeOf)] #[derive(Debug, Clone, PartialEq, HeapSizeOf)]
pub struct T(pub Vec<String>); pub struct T(pub Vec<Atom>);
impl ToCss for T { impl ToCss for T {
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write { fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
@ -603,7 +604,8 @@ ${helpers.single_keyword("overflow-x", "visible hidden scroll auto", need_clone=
if i != 0 { if i != 0 {
try!(dest.write_str(", ")); try!(dest.write_str(", "));
} }
try!(dest.write_str(&name)); // NB: to_string() needed due to geckolib backend.
try!(dest.write_str(&*name.to_string()));
} }
Ok(()) Ok(())
} }
@ -620,7 +622,7 @@ ${helpers.single_keyword("overflow-x", "visible hidden scroll auto", need_clone=
pub fn parse(_: &ParserContext, input: &mut Parser) -> Result<SpecifiedValue,()> { pub fn parse(_: &ParserContext, input: &mut Parser) -> Result<SpecifiedValue,()> {
use std::borrow::Cow; use std::borrow::Cow;
Ok(SpecifiedValue(try!(input.parse_comma_separated(|input| { Ok(SpecifiedValue(try!(input.parse_comma_separated(|input| {
input.expect_ident().map(Cow::into_owned) input.expect_ident().map(Atom::from)
})))) }))))
} }

5
components/style/selector_matching.rs
View file

@ -24,6 +24,7 @@ use std::collections::HashMap;
use std::hash::BuildHasherDefault; use std::hash::BuildHasherDefault;
use std::process; use std::process;
use std::sync::Arc; use std::sync::Arc;
use string_cache::Atom;
use style_traits::viewport::ViewportConstraints; use style_traits::viewport::ViewportConstraints;
use stylesheets::{CSSRule, CSSRuleIteratorExt, Origin, Stylesheet}; use stylesheets::{CSSRule, CSSRuleIteratorExt, Origin, Stylesheet};
use url::Url; use url::Url;
@ -129,7 +130,7 @@ pub struct Stylist<Impl: SelectorImplExt> {
BuildHasherDefault<::fnv::FnvHasher>>, BuildHasherDefault<::fnv::FnvHasher>>,
/// A map with all the animations indexed by name. /// A map with all the animations indexed by name.
animations: HashMap<String, KeyframesAnimation>, animations: HashMap<Atom, KeyframesAnimation>,
/// Applicable declarations for a given non-eagerly cascaded pseudo-element. /// Applicable declarations for a given non-eagerly cascaded pseudo-element.
/// These are eagerly computed once, and then used to resolve the new /// These are eagerly computed once, and then used to resolve the new
@ -461,7 +462,7 @@ impl<Impl: SelectorImplExt> Stylist<Impl> {
} }
#[inline] #[inline]
pub fn animations(&self) -> &HashMap<String, KeyframesAnimation> { pub fn animations(&self) -> &HashMap<Atom, KeyframesAnimation> {
&self.animations &self.animations
} }
} }

6
components/style/stylesheets.rs
View file

@ -69,7 +69,7 @@ pub enum CSSRule<Impl: SelectorImpl> {
#[derive(Debug, HeapSizeOf, PartialEq)] #[derive(Debug, HeapSizeOf, PartialEq)]
pub struct KeyframesRule { pub struct KeyframesRule {
pub name: String, pub name: Atom,
pub keyframes: Vec<Keyframe>, pub keyframes: Vec<Keyframe>,
} }
@ -405,7 +405,7 @@ enum AtRulePrelude {
/// A @viewport rule prelude. /// A @viewport rule prelude.
Viewport, Viewport,
/// A @keyframes rule, with its animation name. /// A @keyframes rule, with its animation name.
Keyframes(String), Keyframes(Atom),
} }
@ -507,7 +507,7 @@ impl<'a, 'b, Impl: SelectorImpl> AtRuleParser for NestedRuleParser<'a, 'b, Impl>
}, },
"keyframes" => { "keyframes" => {
let name = try!(input.expect_ident()); let name = try!(input.expect_ident());
Ok(AtRuleType::WithBlock(AtRulePrelude::Keyframes(name.into_owned()))) Ok(AtRuleType::WithBlock(AtRulePrelude::Keyframes(Atom::from(name))))
}, },
_ => Err(()) _ => Err(())
} }