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

Companion single Color patch.

Browse source 
This will also update the rust-azure dependency
to point to the hash where we have a single Color type.

Just executed ref-tests and no regressions found.
This commit is contained in:
Adenilson Cavalcanti 2015-02-12 10:22:40 -08:00
parent 52fc01ad37
commit ffa62c9688
9 changed files with 31 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/gfx/color.rs
View file

@ -3,9 +3,12 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use azure::AzFloat;
use azure::azure_hl::Color as AzColor;
use azure::azure::AzColor;
pub type Color = AzColor;
#[inline]
pub fn new(r: AzFloat, g: AzFloat, b: AzFloat, a: AzFloat) -> AzColor {
AzColor { r: r, g: g, b: b, a: a }
}
#[inline]
pub fn rgb(r: u8, g: u8, b: u8) -> AzColor {

3
components/gfx/display_list/mod.rs
View file

@ -16,7 +16,6 @@
#![deny(unsafe_blocks)]
use color::Color;
use display_list::optimizer::DisplayListOptimizer;
use paint_context::{PaintContext, ToAzureRect};
use self::DisplayItem::*;
@ -25,6 +24,8 @@ use text::glyph::CharIndex;
use text::TextRun;
use azure::azure::AzFloat;
use azure::azure_hl::{Color};
use collections::dlist::{self, DList};
use geom::{Point2D, Rect, SideOffsets2D, Size2D, Matrix2D};
use geom::num::Zero;

17
components/gfx/paint_context.rs
View file

@ -687,7 +687,10 @@ impl<'a> PaintContext<'a> {
}
fn scale_color(&self, color: Color, scale_factor: f32) -> Color {
return Color::new(color.r * scale_factor, color.g * scale_factor, color.b * scale_factor, color.a);
return color::new(color.r * scale_factor,
color.g * scale_factor,
color.b * scale_factor,
color.a);
}
fn draw_double_border_segment(&self,
@ -735,8 +738,8 @@ impl<'a> PaintContext<'a> {
lighter_color = color;
} else {
// You can't scale black color (i.e. 'scaled = 0 * scale', equals black).
darker_color = Color::new(0.3, 0.3, 0.3, color.a);
lighter_color = Color::new(0.7, 0.7, 0.7, color.a);
darker_color = color::new(0.3, 0.3, 0.3, color.a);
lighter_color = color::new(0.7, 0.7, 0.7, color.a);
}
let (outer_color, inner_color) = match (direction, is_groove) {
@ -787,16 +790,16 @@ impl<'a> PaintContext<'a> {
scaled_color = match direction {
Direction::Top | Direction::Left => {
if is_inset {
Color::new(0.3, 0.3, 0.3, color.a)
color::new(0.3, 0.3, 0.3, color.a)
} else {
Color::new(0.7, 0.7, 0.7, color.a)
color::new(0.7, 0.7, 0.7, color.a)
}
}
Direction::Right | Direction::Bottom => {
if is_inset {
Color::new(0.7, 0.7, 0.7, color.a)
color::new(0.7, 0.7, 0.7, color.a)
} else {
Color::new(0.3, 0.3, 0.3, color.a)
color::new(0.3, 0.3, 0.3, color.a)
}
}
};