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

#15842 Add gecko glue for caret-color.

Browse source 
Implement from(StyleComplexColor) for ColorOrAuto. Thanks @emilio. (+4 squashed commits)
Squashed commits:
[baf7cc0] Add clone to caret-color
[9cb82ca] Correctly call methods to copy a color in a SympleComplexColor and getting its auto
[c483f07] Add set and copy functions for caret_color
[0aa20be] Move caret-color and set its product property to gecko
This commit is contained in:
Stefano Chiodino 2017-03-09 13:51:04 +00:00
parent e34aac03ff
commit f195b247c0
4 changed files with 50 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

25
components/style/gecko_bindings/sugar/style_complex_color.rs
View file

@ -4,9 +4,10 @@
//! Rust helpers to interact with Gecko's StyleComplexColor.
use cssparser::Color;
use cssparser;
use gecko::values::{convert_nscolor_to_rgba, convert_rgba_to_nscolor};
use gecko_bindings::structs::{nscolor, StyleComplexColor};
use values;
impl From<nscolor> for StyleComplexColor {
fn from(other: nscolor) -> Self {
@ -38,8 +39,10 @@ impl StyleComplexColor {
}
}
impl From<Color> for StyleComplexColor {
fn from(other: Color) -> Self {
impl From<cssparser::Color> for StyleComplexColor {
fn from(other: cssparser::Color) -> Self {
use cssparser::Color;
match other {
Color::RGBA(rgba) => convert_rgba_to_nscolor(&rgba).into(),
Color::CurrentColor => StyleComplexColor::current_color(),
@ -47,8 +50,22 @@ impl From<Color> for StyleComplexColor {
}
}
impl From<StyleComplexColor> for Color {
impl From<StyleComplexColor> for values::computed::ColorOrAuto {
fn from(color: StyleComplexColor) -> Self {
use values::{Auto, Either};
if color.mIsAuto {
return Either::Second(Auto);
}
Either::First(color.into())
}
}
impl From<StyleComplexColor> for cssparser::Color {
fn from(other: StyleComplexColor) -> Self {
use cssparser::Color;
if other.mForegroundRatio == 0 {
Color::RGBA(convert_nscolor_to_rgba(other.mColor))
} else if other.mForegroundRatio == 255 {