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

style: Fix origin iteration order.

Browse source
This commit is contained in:
Cameron McCormack 2017-08-12 17:38:06 +08:00
parent 84451e521b
commit d90ff1801a
1 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

32
components/style/stylesheets/origin.rs
View file

@ -16,11 +16,11 @@ pub enum Origin {
/// https://drafts.csswg.org/css-cascade/#cascade-origin-us /// https://drafts.csswg.org/css-cascade/#cascade-origin-us
UserAgent, UserAgent,
/// https://drafts.csswg.org/css-cascade/#cascade-origin-author
Author,
/// https://drafts.csswg.org/css-cascade/#cascade-origin-user /// https://drafts.csswg.org/css-cascade/#cascade-origin-user
User, User,
/// https://drafts.csswg.org/css-cascade/#cascade-origin-author
Author,
} }
/// An object that stores a `T` for each origin of the CSS cascade. /// An object that stores a `T` for each origin of the CSS cascade.
@ -30,11 +30,11 @@ pub struct PerOrigin<T> {
/// Data for `Origin::UserAgent`. /// Data for `Origin::UserAgent`.
pub user_agent: T, pub user_agent: T,
/// Data for `Origin::Author`.
pub author: T,
/// Data for `Origin::User`. /// Data for `Origin::User`.
pub user: T, pub user: T,
/// Data for `Origin::Author`.
pub author: T,
} }
impl<T> PerOrigin<T> { impl<T> PerOrigin<T> {
@ -43,8 +43,8 @@ impl<T> PerOrigin<T> {
pub fn borrow_for_origin(&self, origin: &Origin) -> &T { pub fn borrow_for_origin(&self, origin: &Origin) -> &T {
match *origin { match *origin {
Origin::UserAgent => &self.user_agent, Origin::UserAgent => &self.user_agent,
Origin::Author => &self.author,
Origin::User => &self.user, Origin::User => &self.user,
Origin::Author => &self.author,
} }
} }
@ -54,13 +54,13 @@ impl<T> PerOrigin<T> {
pub fn borrow_mut_for_origin(&mut self, origin: &Origin) -> &mut T { pub fn borrow_mut_for_origin(&mut self, origin: &Origin) -> &mut T {
match *origin { match *origin {
Origin::UserAgent => &mut self.user_agent, Origin::UserAgent => &mut self.user_agent,
Origin::Author => &mut self.author,
Origin::User => &mut self.user, Origin::User => &mut self.user,
Origin::Author => &mut self.author,
} }
} }
/// Iterates over references to per-origin extra style data, from highest /// Iterates over references to per-origin extra style data, from highest
/// level (user) to lowest (user agent). /// level (author) to lowest (user agent).
pub fn iter_origins(&self) -> PerOriginIter<T> { pub fn iter_origins(&self) -> PerOriginIter<T> {
PerOriginIter { PerOriginIter {
data: &self, data: &self,
@ -69,7 +69,7 @@ impl<T> PerOrigin<T> {
} }
/// Iterates over mutable references to per-origin extra style data, from /// Iterates over mutable references to per-origin extra style data, from
/// highest level (user) to lowest (user agent). /// highest level (author) to lowest (user agent).
pub fn iter_mut_origins(&mut self) -> PerOriginIterMut<T> { pub fn iter_mut_origins(&mut self) -> PerOriginIterMut<T> {
PerOriginIterMut { PerOriginIterMut {
data: self, data: self,
@ -88,12 +88,12 @@ pub trait PerOriginClear {
impl<T> PerOriginClear for PerOrigin<T> where T: PerOriginClear { impl<T> PerOriginClear for PerOrigin<T> where T: PerOriginClear {
fn clear(&mut self) { fn clear(&mut self) {
self.user_agent.clear(); self.user_agent.clear();
self.author.clear();
self.user.clear(); self.user.clear();
self.author.clear();
} }
} }
/// Iterator over `PerOrigin<T>`, from highest level (user) to lowest /// Iterator over `PerOrigin<T>`, from highest level (author) to lowest
/// (user agent). /// (user agent).
/// ///
/// We rely on this specific order for correctly looking up @font-face, /// We rely on this specific order for correctly looking up @font-face,
@ -108,8 +108,8 @@ impl<'a, T> Iterator for PerOriginIter<'a, T> where T: 'a {
fn next(&mut self) -> Option<Self::Item> { fn next(&mut self) -> Option<Self::Item> {
let result = match self.cur { let result = match self.cur {
0 => (&self.data.user, Origin::User), 0 => (&self.data.author, Origin::Author),
1 => (&self.data.author, Origin::Author), 1 => (&self.data.user, Origin::User),
2 => (&self.data.user_agent, Origin::UserAgent), 2 => (&self.data.user_agent, Origin::UserAgent),
_ => return None, _ => return None,
}; };
@ -135,8 +135,8 @@ impl<'a, T> Iterator for PerOriginIterMut<'a, T> where T: 'a {
fn next(&mut self) -> Option<Self::Item> { fn next(&mut self) -> Option<Self::Item> {
let result = match self.cur { let result = match self.cur {
0 => (unsafe { transmute(&mut (*self.data).user) }, Origin::User), 0 => (unsafe { transmute(&mut (*self.data).author) }, Origin::Author),
1 => (unsafe { transmute(&mut (*self.data).author) }, Origin::Author), 1 => (unsafe { transmute(&mut (*self.data).user) }, Origin::User),
2 => (unsafe { transmute(&mut (*self.data).user_agent) }, Origin::UserAgent), 2 => (unsafe { transmute(&mut (*self.data).user_agent) }, Origin::UserAgent),
_ => return None, _ => return None,
}; };