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

sort all uses

Browse source
This commit is contained in:
Johann Tuffe 2015-08-20 20:47:12 +08:00
parent d3c7e31722
commit ec07178b6f
269 changed files with 903 additions and 931 deletions
Download patch file Download diff file Expand all files Collapse all files

30
components/style/animation.rs
View file

@ -2,28 +2,28 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use cssparser::{RGBA, Color};
use properties::ComputedValues;
use properties::longhands::transition_property::computed_value::TransitionProperty;
use properties::longhands::transition_timing_function::computed_value::{StartEnd};
use properties::longhands::transition_timing_function::computed_value::{TransitionTimingFunction};
use properties::longhands::z_index::computed_value::T as ZIndex;
use properties::longhands::visibility::computed_value::T as Visibility;
use properties::longhands::vertical_align::computed_value::T as VerticalAlign;
use properties::longhands::border_spacing::computed_value::T as BorderSpacing;
use properties::longhands::line_height::computed_value::T as LineHeight;
use properties::longhands::font_weight::computed_value::T as FontWeight;
use properties::longhands::clip::computed_value::ClipRect;
use properties::longhands::text_shadow::computed_value::TextShadow;
use properties::longhands::text_shadow::computed_value::T as TextShadowList;
use properties::longhands::background_position::computed_value::T as BackgroundPosition;
use properties::longhands::transition_property;
use properties::longhands::border_spacing::computed_value::T as BorderSpacing;
use properties::longhands::clip::computed_value::ClipRect;
use properties::longhands::font_weight::computed_value::T as FontWeight;
use properties::longhands::line_height::computed_value::T as LineHeight;
use properties::longhands::text_shadow::computed_value::T as TextShadowList;
use properties::longhands::text_shadow::computed_value::TextShadow;
use properties::longhands::transform::computed_value::ComputedMatrix;
use properties::longhands::transform::computed_value::ComputedOperation as TransformOperation;
use properties::longhands::transform::computed_value::T as TransformList;
use properties::longhands::transition_property;
use properties::longhands::transition_property::computed_value::TransitionProperty;
use properties::longhands::transition_timing_function::computed_value::{StartEnd};
use properties::longhands::transition_timing_function::computed_value::{TransitionTimingFunction};
use properties::longhands::vertical_align::computed_value::T as VerticalAlign;
use properties::longhands::visibility::computed_value::T as Visibility;
use properties::longhands::z_index::computed_value::T as ZIndex;
use values::CSSFloat;
use values::computed::{Angle, LengthOrPercentageOrAuto, LengthOrPercentageOrNone};
use values::computed::{LengthOrPercentage, Length, Time};
use values::CSSFloat;
use cssparser::{RGBA, Color};
use euclid::point::Point2D;
use std::cmp::Ordering;

2
components/style/build.rs
View file

@ -5,8 +5,8 @@
use std::env;
use std::fs::File;
use std::io::Write;
use std::process::{Command, Stdio, exit};
use std::path::Path;
use std::process::{Command, Stdio, exit};
fn main() {

4
components/style/legacy.rs
View file

@ -7,11 +7,11 @@
use std::sync::Arc;
use selectors::Element;
use selectors::matching::DeclarationBlock;
use node::TElementAttributes;
use properties::PropertyDeclaration;
use selector_matching::Stylist;
use selectors::Element;
use selectors::matching::DeclarationBlock;
use smallvec::VecLike;

2
components/style/media_queries.rs
View file

@ -2,8 +2,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use std::ascii::AsciiExt;
use cssparser::{Token, Parser, Delimiter};
use std::ascii::AsciiExt;
use euclid::size::{Size2D, TypedSize2D};
use properties::longhands;

4
components/style/parser.rs
View file

@ -3,10 +3,10 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use selectors::parser::ParserContext as SelectorParserContext;
use cssparser::{Parser, SourcePosition};
use url::{Url, UrlParser};
use log;
use selectors::parser::ParserContext as SelectorParserContext;
use url::{Url, UrlParser};
use stylesheets::Origin;

88
components/style/properties.mako.rs
View file

@ -14,21 +14,21 @@ use std::intrinsics;
use std::mem;
use std::sync::Arc;
use util::logical_geometry::{LogicalMargin, PhysicalSide, WritingMode};
use util::geometry::Au;
use url::Url;
use cssparser::{Parser, Color, RGBA, AtRuleParser, DeclarationParser,
DeclarationListParser, parse_important, ToCss};
use fnv::FnvHasher;
use url::Url;
use util::geometry::Au;
use util::logical_geometry::{LogicalMargin, PhysicalSide, WritingMode};
use euclid::SideOffsets2D;
use euclid::size::Size2D;
use fnv::FnvHasher;
use values::specified::{Length, BorderStyle};
use values::computed::{self, ToComputedValue};
use selectors::matching::DeclarationBlock;
use parser::{ParserContext, log_css_error};
use stylesheets::Origin;
use computed_values;
use parser::{ParserContext, log_css_error};
use selectors::matching::DeclarationBlock;
use stylesheets::Origin;
use values::computed::{self, ToComputedValue};
use values::specified::{Length, BorderStyle};
use self::property_bit_field::PropertyBitField;
@ -128,9 +128,9 @@ pub mod longhands {
use properties::longhands;
use properties::property_bit_field::PropertyBitField;
use properties::{ComputedValues, PropertyDeclaration};
use std::sync::Arc;
use values::computed::ToComputedValue;
use values::{computed, specified};
use std::sync::Arc;
${caller.body()}
#[allow(unused_variables)]
pub fn cascade_property(declaration: &PropertyDeclaration,
@ -287,10 +287,10 @@ pub mod longhands {
% for side in ["top", "right", "bottom", "left"]:
<%self:longhand name="border-${side}-width">
use values::computed::Context;
use util::geometry::Au;
use cssparser::ToCss;
use std::fmt;
use util::geometry::Au;
use values::computed::Context;
impl ToCss for SpecifiedValue {
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
@ -355,10 +355,10 @@ pub mod longhands {
</%self:longhand>
<%self:longhand name="outline-width">
use values::computed::Context;
use util::geometry::Au;
use cssparser::ToCss;
use std::fmt;
use util::geometry::Au;
use values::computed::Context;
impl ToCss for SpecifiedValue {
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
@ -556,10 +556,10 @@ pub mod longhands {
${switch_to_style_struct("InheritedBox")}
<%self:longhand name="line-height">
use values::computed::Context;
use cssparser::ToCss;
use std::fmt;
use values::CSSFloat;
use values::computed::Context;
#[derive(Clone, PartialEq, Copy)]
pub enum SpecifiedValue {
@ -581,8 +581,8 @@ pub mod longhands {
}
/// normal | <number> | <length> | <percentage>
pub fn parse(_context: &ParserContext, input: &mut Parser) -> Result<SpecifiedValue, ()> {
use std::ascii::AsciiExt;
use cssparser::Token;
use std::ascii::AsciiExt;
match try!(input.next()) {
Token::Number(ref value) if value.value >= 0. => {
Ok(SpecifiedValue::Number(value.value))
@ -601,9 +601,9 @@ pub mod longhands {
}
}
pub mod computed_value {
use values::CSSFloat;
use util::geometry::Au;
use std::fmt;
use util::geometry::Au;
use values::CSSFloat;
#[derive(PartialEq, Copy, Clone, HeapSizeOf)]
pub enum T {
Normal,
@ -655,9 +655,9 @@ pub mod longhands {
${switch_to_style_struct("Box")}
<%self:longhand name="vertical-align">
use values::computed::Context;
use cssparser::ToCss;
use std::fmt;
use values::computed::Context;
<% vertical_align_keywords = (
"baseline sub super top text-top middle bottom text-bottom".split()) %>
@ -700,9 +700,9 @@ pub mod longhands {
})
}
pub mod computed_value {
use values::CSSFloat;
use util::geometry::Au;
use std::fmt;
use util::geometry::Au;
use values::CSSFloat;
#[allow(non_camel_case_types)]
#[derive(PartialEq, Copy, Clone, HeapSizeOf)]
pub enum T {
@ -1028,9 +1028,9 @@ pub mod longhands {
""")}
<%self:longhand name="list-style-image">
use url::Url;
use cssparser::{ToCss, Token};
use std::fmt;
use url::Url;
use values::computed::Context;
#[derive(Clone, PartialEq, Eq)]
@ -1051,9 +1051,9 @@ pub mod longhands {
}
pub mod computed_value {
use url::Url;
use cssparser::{ToCss, Token};
use std::fmt;
use url::Url;
#[derive(Clone, PartialEq, HeapSizeOf)]
pub struct T(pub Option<Url>);
@ -1094,9 +1094,9 @@ pub mod longhands {
</%self:longhand>
<%self:longhand name="quotes">
use std::borrow::Cow;
use std::fmt;
use values::computed::ComputedValueAsSpecified;
use std::borrow::Cow;
use cssparser::{ToCss, Token};
@ -1162,8 +1162,8 @@ pub mod longhands {
${new_style_struct("Counters", is_inherited=False)}
<%self:longhand name="counter-increment">
use super::content;
use std::fmt;
use super::content;
use values::computed::ComputedValueAsSpecified;
use cssparser::{ToCss, Token};
@ -1240,10 +1240,10 @@ pub mod longhands {
"::cssparser::Color::RGBA(::cssparser::RGBA { red: 0., green: 0., blue: 0., alpha: 0. }) /* transparent */")}
<%self:longhand name="background-image">
use values::specified::Image;
use values::computed::Context;
use cssparser::ToCss;
use std::fmt;
use values::computed::Context;
use values::specified::Image;
pub mod computed_value {
use values::computed;
@ -1563,8 +1563,8 @@ pub mod longhands {
<%self:raw_longhand name="color">
use cssparser::{Color, RGBA};
use values::specified::{CSSColor, CSSRGBA};
use values::computed::Context;
use values::specified::{CSSColor, CSSRGBA};
impl ToComputedValue for SpecifiedValue {
type ComputedValue = computed_value::T;
@ -1610,8 +1610,8 @@ pub mod longhands {
impl ComputedValueAsSpecified for SpecifiedValue {}
pub mod computed_value {
use cssparser::ToCss;
use string_cache::Atom;
use std::fmt;
use string_cache::Atom;
#[derive(PartialEq, Eq, Clone, Hash, HeapSizeOf)]
pub enum FontFamily {
@ -1818,10 +1818,10 @@ pub mod longhands {
</%self:longhand>
<%self:longhand name="font-size">
use util::geometry::Au;
use values::computed::Context;
use cssparser::ToCss;
use std::fmt;
use util::geometry::Au;
use values::computed::Context;
impl ToCss for SpecifiedValue {
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
@ -1937,9 +1937,9 @@ pub mod longhands {
</%self:longhand>
<%self:longhand name="letter-spacing">
use values::computed::Context;
use cssparser::ToCss;
use std::fmt;
use values::computed::Context;
#[derive(Clone, Copy, PartialEq)]
pub enum SpecifiedValue {
@ -1999,9 +1999,9 @@ pub mod longhands {
</%self:longhand>
<%self:longhand name="word-spacing">
use values::computed::Context;
use cssparser::ToCss;
use std::fmt;
use values::computed::Context;
#[derive(Clone, Copy, PartialEq)]
pub enum SpecifiedValue {
@ -2439,9 +2439,9 @@ pub mod longhands {
${new_style_struct("Column", is_inherited=False)}
<%self:longhand name="column-width" experimental="True">
use values::computed::Context;
use cssparser::ToCss;
use std::fmt;
use values::computed::Context;
#[derive(Clone, Copy, PartialEq)]
pub enum SpecifiedValue {
@ -2501,9 +2501,9 @@ pub mod longhands {
</%self:longhand>
<%self:longhand name="column-count" experimental="True">
use values::computed::Context;
use cssparser::ToCss;
use std::fmt;
use values::computed::Context;
#[derive(Clone, Copy, PartialEq)]
pub enum SpecifiedValue {
@ -2567,9 +2567,9 @@ pub mod longhands {
</%self:longhand>
<%self:longhand name="column-gap" experimental="True">
use values::computed::Context;
use cssparser::ToCss;
use std::fmt;
use values::computed::Context;
#[derive(Clone, Copy, PartialEq)]
pub enum SpecifiedValue {
@ -2632,10 +2632,10 @@ pub mod longhands {
${new_style_struct("Effects", is_inherited=False)}
<%self:longhand name="opacity">
use values::CSSFloat;
use values::computed::Context;
use cssparser::ToCss;
use std::fmt;
use values::CSSFloat;
use values::computed::Context;
impl ToCss for SpecifiedValue {
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
@ -2730,9 +2730,9 @@ pub mod longhands {
}
pub mod computed_value {
use std::fmt;
use util::geometry::Au;
use values::computed;
use std::fmt;
#[derive(Clone, PartialEq, HeapSizeOf)]
pub struct T(pub Vec<BoxShadow>);
@ -3243,10 +3243,10 @@ pub mod longhands {
<%self:longhand name="filter">
//pub use self::computed_value::T as SpecifiedValue;
use values::specified::{Angle, Length};
use values::CSSFloat;
use cssparser::ToCss;
use std::fmt;
use values::CSSFloat;
use values::specified::{Angle, Length};
#[derive(Clone, PartialEq)]
pub struct SpecifiedValue(Vec<SpecifiedFilter>);
@ -4862,8 +4862,8 @@ pub mod shorthands {
<%self:shorthand name="${name}" sub_properties="${
' '.join(sub_property_pattern % side
for side in ['top', 'right', 'bottom', 'left'])}">
use values::specified;
use super::parse_four_sides;
use values::specified;
let _unused = context;
let (top, right, bottom, left) = try!(parse_four_sides(input, ${parser_function}));
Ok(Longhands {
@ -4976,8 +4976,8 @@ pub mod shorthands {
<%self:shorthand name="border-width" sub_properties="${
' '.join('border-%s-width' % side
for side in ['top', 'right', 'bottom', 'left'])}">
use values::specified;
use super::parse_four_sides;
use values::specified;
let _unused = context;
let (top, right, bottom, left) = try!(parse_four_sides(input, specified::parse_border_width));
Ok(Longhands {
@ -5100,8 +5100,8 @@ pub mod shorthands {
</%self:shorthand>
<%self:shorthand name="outline" sub_properties="outline-color outline-style outline-width">
use values::specified;
use properties::longhands::outline_width;
use values::specified;
let _unused = context;
let mut color = None;

12
components/style/selector_matching.rs
View file

@ -4,15 +4,15 @@
use url::Url;
use selectors::bloom::BloomFilter;
use selectors::matching::{SelectorMap, Rule};
use selectors::matching::DeclarationBlock as GenericDeclarationBlock;
use selectors::parser::PseudoElement;
use selectors::Element;
use std::process;
use selectors::bloom::BloomFilter;
use selectors::matching::DeclarationBlock as GenericDeclarationBlock;
use selectors::matching::{SelectorMap, Rule};
use selectors::parser::PseudoElement;
use smallvec::VecLike;
use util::resource_files::read_resource_file;
use std::process;
use util::opts;
use util::resource_files::read_resource_file;
use legacy::PresentationalHintSynthesis;
use media_queries::Device;

10
components/style/stylesheets.rs
View file

@ -12,13 +12,13 @@ use encoding::EncodingRef;
use cssparser::{Parser, decode_stylesheet_bytes, QualifiedRuleParser, AtRuleParser};
use cssparser::{RuleListParser, AtRuleType};
use string_cache::{Atom, Namespace};
use selectors::parser::{Selector, parse_selector_list};
use font_face::{FontFaceRule, parse_font_face_block};
use media_queries::{Device, MediaQueryList, parse_media_query_list};
use parser::{ParserContext, log_css_error};
use properties::{PropertyDeclarationBlock, parse_property_declaration_list};
use media_queries::{Device, MediaQueryList, parse_media_query_list};
use font_face::{FontFaceRule, parse_font_face_block};
use selectors::parser::{Selector, parse_selector_list};
use smallvec::SmallVec;
use string_cache::{Atom, Namespace};
use viewport::ViewportRule;
@ -216,9 +216,9 @@ pub mod rule_filter {
//! Specific `CSSRule` variant iterators.
use std::marker::PhantomData;
use super::{CSSRule, MediaRule, StyleRule};
use super::super::font_face::FontFaceRule;
use super::super::viewport::ViewportRule;
use super::{CSSRule, MediaRule, StyleRule};
macro_rules! rule_filter {
($variant:ident -> $value:ty) => {

12
components/style/values.rs
View file

@ -74,18 +74,18 @@ pub type CSSFloat = f32;
pub mod specified {
use cssparser::{self, Token, Parser, ToCss, CssStringWriter};
use euclid::size::Size2D;
use parser::ParserContext;
use std::ascii::AsciiExt;
use std::cmp;
use std::f32::consts::PI;
use std::fmt;
use std::fmt::Write;
use std::ops::Mul;
use url::Url;
use cssparser::{self, Token, Parser, ToCss, CssStringWriter};
use euclid::size::Size2D;
use parser::ParserContext;
use util::geometry::Au;
use super::CSSFloat;
use url::Url;
use util::geometry::Au;
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
pub enum AllowedNumericType {
@ -859,7 +859,7 @@ pub mod specified {
pub mod computed {
pub use super::specified::{Angle, BorderStyle, Time};
use super::specified::{AngleOrCorner};
use super::specified::AngleOrCorner;
use super::{specified, CSSFloat};
pub use cssparser::Color as CSSColor;
use euclid::size::Size2D;

4
components/style/viewport.rs
View file

@ -3,8 +3,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use cssparser::{Parser, DeclarationListParser, AtRuleParser, DeclarationParser, ToCss, parse_important};
use euclid::size::{Size2D, TypedSize2D};
use euclid::scale_factor::ScaleFactor;
use euclid::size::{Size2D, TypedSize2D};
use parser::{ParserContext, log_css_error};
use properties::longhands;
use stylesheets::Origin;
@ -342,8 +342,8 @@ impl ViewportConstraints {
rule: &ViewportRule)
-> Option<ViewportConstraints>
{
use std::cmp;
use num::{Float, ToPrimitive};
use std::cmp;
if rule.declarations.is_empty() {
return None