diff options
author | Xidorn Quan <me@upsuper.org> | 2017-06-08 10:42:31 +1000 |
---|---|---|
committer | Xidorn Quan <me@upsuper.org> | 2017-06-08 12:59:26 +1000 |
commit | c62935577a36ea98c9d625747cc3e4387ee9941e (patch) | |
tree | 4e716caa58a6ff080eff1007554ba6ca1ee50f94 /components/layout | |
parent | 742c45f8599272fd77cd342ca81621daa76366b6 (diff) | |
download | servo-c62935577a36ea98c9d625747cc3e4387ee9941e.tar.gz servo-c62935577a36ea98c9d625747cc3e4387ee9941e.zip |
Add separate computed Color value.
Diffstat (limited to 'components/layout')
-rw-r--r-- | components/layout/Cargo.toml | 1 | ||||
-rw-r--r-- | components/layout/lib.rs | 1 | ||||
-rw-r--r-- | components/layout/table_cell.rs | 2 | ||||
-rw-r--r-- | components/layout/table_row.rs | 5 |
4 files changed, 3 insertions, 6 deletions
diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml index 763ac1288a4..e9679887da6 100644 --- a/components/layout/Cargo.toml +++ b/components/layout/Cargo.toml @@ -14,7 +14,6 @@ app_units = "0.4.1" atomic_refcell = "0.1" bitflags = "0.7" canvas_traits = {path = "../canvas_traits"} -cssparser = "0.13.7" euclid = "0.13" fnv = "1.0" gfx = {path = "../gfx"} diff --git a/components/layout/lib.rs b/components/layout/lib.rs index 65923c10554..ca85d83e9d1 100644 --- a/components/layout/lib.rs +++ b/components/layout/lib.rs @@ -16,7 +16,6 @@ extern crate atomic_refcell; extern crate bitflags; extern crate canvas_traits; extern crate core; -extern crate cssparser; extern crate euclid; extern crate fnv; extern crate gfx; diff --git a/components/layout/table_cell.rs b/components/layout/table_cell.rs index 8c54297d4b5..47f74891488 100644 --- a/components/layout/table_cell.rs +++ b/components/layout/table_cell.rs @@ -9,7 +9,6 @@ use app_units::Au; use block::{BlockFlow, ISizeAndMarginsComputer, MarginsMayCollapseFlag}; use context::LayoutContext; -use cssparser::Color; use display_list_builder::{BlockFlowDisplayListBuilding, BorderPaintingMode, DisplayListBuildState}; use euclid::{Point2D, Rect, SideOffsets2D, Size2D}; use flow::{self, Flow, FlowClass, IS_ABSOLUTELY_POSITIONED, OpaqueFlow}; @@ -22,6 +21,7 @@ use std::fmt; use style::computed_values::{border_collapse, border_top_style, vertical_align}; use style::logical_geometry::{LogicalMargin, LogicalRect, LogicalSize, WritingMode}; use style::properties::ServoComputedValues; +use style::values::computed::Color; use table::InternalTable; use table_row::{CollapsedBorder, CollapsedBorderProvenance}; diff --git a/components/layout/table_row.rs b/components/layout/table_row.rs index 8d074f59c52..2fb61a336de 100644 --- a/components/layout/table_row.rs +++ b/components/layout/table_row.rs @@ -9,7 +9,6 @@ use app_units::Au; use block::{BlockFlow, ISizeAndMarginsComputer}; use context::LayoutContext; -use cssparser::{Color, RGBA}; use display_list_builder::{BlockFlowDisplayListBuilding, BorderPaintingMode, DisplayListBuildState}; use euclid::Point2D; use flow::{self, EarlyAbsolutePositionInfo, Flow, FlowClass, ImmutableFlowUtils, OpaqueFlow}; @@ -26,7 +25,7 @@ use style::computed_values::{border_collapse, border_spacing, border_top_style}; use style::logical_geometry::{LogicalSize, PhysicalSide, WritingMode}; use style::properties::ServoComputedValues; use style::servo::restyle_damage::{REFLOW, REFLOW_OUT_OF_FLOW}; -use style::values::computed::LengthOrPercentageOrAuto; +use style::values::computed::{Color, LengthOrPercentageOrAuto}; use table::{ColumnComputedInlineSize, ColumnIntrinsicInlineSize, InternalTable, VecExt}; use table_cell::{CollapsedBordersForCell, TableCellFlow}; @@ -606,7 +605,7 @@ impl CollapsedBorder { CollapsedBorder { style: border_top_style::T::none, width: Au(0), - color: Color::RGBA(RGBA::transparent()), + color: Color::transparent(), provenance: CollapsedBorderProvenance::FromTable, } } |