clamp rgb values to [0,1]

Author: dzbarsky

src/color.rs

@@ -321,11 +321,14 @@ fn parse_color_function(name: &str, arguments: &mut Parser) -> Result<Color, ()>
         // Either integers or percentages, but all the same type.
         match try!(arguments.next()) {
             Token::Number(ref v) if v.int_value.is_some() => {
-                red = v.value / 255.;
+                fn clamp(value: f32) -> f32 {
+                    0f32.max(1f32.min(value))
+                }
+                red = clamp(v.value / 255.);
                 try!(arguments.expect_comma());
-                green = try!(arguments.expect_integer()) as f32 / 255.;
+                green = clamp(try!(arguments.expect_integer()) as f32 / 255.);
                 try!(arguments.expect_comma());
-                blue = try!(arguments.expect_integer()) as f32 / 255.;
+                blue = clamp(try!(arguments.expect_integer()) as f32 / 255.);
             }
             Token::Percentage(ref v) => {
                 red = v.unit_value;

src/css-parsing-tests/color3.json

@@ -46,7 +46,7 @@
 "rgb(0,51,255)", [0, 0.2, 1, 1],
 "rgb(0\t,  51 ,255)", [0, 0.2, 1, 1],
 "rgb(/* R */0, /* G */51, /* B */255)", [0, 0.2, 1, 1],
-"rgb(-51, 306, 0)", [-0.2, 1.2, 0, 1],
+"rgb(-51, 306, 0)", [0, 1, 0, 1],
 
 "rgb(42%, 3%, 50%)", [0.42, 0.03, 0.5, 1],
 "RGB(100%, 100%, 100%)", [1, 1, 1, 1],