mirror of
https://github.com/servo/servo.git
synced 2025-08-06 06:00:15 +01:00
Auto merge of #15518 - emilio:color, r=SimonSapin
style: Unbox a bunch of color properties. This builds on https://github.com/servo/rust-cssparser/pull/118. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15518) <!-- Reviewable:end -->
This commit is contained in:
commit
357bf3b85a
37 changed files with 185 additions and 195 deletions
|
@ -14,7 +14,7 @@ app_units = "0.3"
|
|||
atomic_refcell = "0.1"
|
||||
bitflags = "0.7"
|
||||
canvas_traits = {path = "../canvas_traits"}
|
||||
cssparser = {version = "0.7", features = ["heap_size", "serde-serialization"]}
|
||||
cssparser = {version = "0.8", features = ["heap_size", "serde-serialization"]}
|
||||
euclid = "0.10.1"
|
||||
fnv = "1.0"
|
||||
gfx = {path = "../gfx"}
|
||||
|
|
|
@ -2188,7 +2188,7 @@ pub trait ToGfxColor {
|
|||
|
||||
impl ToGfxColor for RGBA {
|
||||
fn to_gfx_color(&self) -> ColorF {
|
||||
ColorF::new(self.red, self.green, self.blue, self.alpha)
|
||||
ColorF::new(self.red_f32(), self.green_f32(), self.blue_f32(), self.alpha_f32())
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -607,12 +607,7 @@ impl CollapsedBorder {
|
|||
CollapsedBorder {
|
||||
style: border_top_style::T::none,
|
||||
width: Au(0),
|
||||
color: Color::RGBA(RGBA {
|
||||
red: 0.0,
|
||||
green: 0.0,
|
||||
blue: 0.0,
|
||||
alpha: 0.0,
|
||||
}),
|
||||
color: Color::RGBA(RGBA::transparent()),
|
||||
provenance: CollapsedBorderProvenance::FromTable,
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue