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

auto merge of #4832 : Adenilson/servo/transparentBlack01, r=jdm

Browse source 
This patch set will implement a new helper function for transparent black, while changing the behavior of helper black() function returning opaque black by default.

It will also use the new Color equality operator to streamline the code in some points.
This commit is contained in:
bors-servo 2015-02-04 04:21:49 -07:00
commit e14c569ed0
4 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/compositing/compositor.rs
View file

@ -508,7 +508,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
epoch: Epoch(0), epoch: Epoch(0),
id: LayerId::null(), id: LayerId::null(),
rect: Rect::zero(), rect: Rect::zero(),
background_color: color::black(), background_color: color::transparent_black(),
scroll_policy: ScrollPolicy::Scrollable, scroll_policy: ScrollPolicy::Scrollable,
}; };

5
components/gfx/color.rs
View file

@ -24,6 +24,11 @@ pub fn rgba(r: AzFloat, g: AzFloat, b: AzFloat, a: AzFloat) -> AzColor {
#[inline] #[inline]
pub fn black() -> AzColor { pub fn black() -> AzColor {
AzColor { r: 0.0, g: 0.0, b: 0.0, a: 1.0 }
}
#[inline]
pub fn transparent_black() -> AzColor {
AzColor { r: 0.0, g: 0.0, b: 0.0, a: 0.0 } AzColor { r: 0.0, g: 0.0, b: 0.0, a: 0.0 }
} }

10
components/gfx/paint_context.rs
View file

@ -154,7 +154,7 @@ impl<'a> PaintContext<'a> {
} }
pub fn clear(&self) { pub fn clear(&self) {
let pattern = ColorPattern::new(color::black()); let pattern = ColorPattern::new(color::transparent_black());
let rect = Rect(Point2D(self.page_rect.origin.x as AzFloat, let rect = Rect(Point2D(self.page_rect.origin.x as AzFloat,
self.page_rect.origin.y as AzFloat), self.page_rect.origin.y as AzFloat),
Size2D(self.screen_rect.size.width as AzFloat, Size2D(self.screen_rect.size.width as AzFloat,
@ -729,9 +729,8 @@ impl<'a> PaintContext<'a> {
}; };
let mut lighter_color; let mut lighter_color;
let mut darker_color = color::black();; let mut darker_color = color::black();
// TODO(Savago): Use equality operators when we sync with rust-azure. if color != darker_color {
if color.r != darker_color.r || color.g != darker_color.g || color.b != darker_color.b {
darker_color = self.scale_color(color, if is_groove { 1.0/3.0 } else { 2.0/3.0 }); darker_color = self.scale_color(color, if is_groove { 1.0/3.0 } else { 2.0/3.0 });
lighter_color = color; lighter_color = color;
} else { } else {
@ -775,8 +774,7 @@ impl<'a> PaintContext<'a> {
// You can't scale black color (i.e. 'scaled = 0 * scale', equals black). // You can't scale black color (i.e. 'scaled = 0 * scale', equals black).
let mut scaled_color = color::black(); let mut scaled_color = color::black();
// TODO(Savago): Use equality operators when we sync with rust-azure. if color != scaled_color {
if color.r != scaled_color.r || color.g != scaled_color.g || color.b != scaled_color.b {
scaled_color = match direction { scaled_color = match direction {
Direction::Top | Direction::Left => { Direction::Top | Direction::Left => {
self.scale_color(color, if is_inset { 2.0/3.0 } else { 1.0 }) self.scale_color(color, if is_inset { 2.0/3.0 } else { 1.0 })

6
components/layout/layout_task.rs
View file

@ -677,10 +677,8 @@ impl LayoutTask {
.to_gfx_color() .to_gfx_color()
}; };
let black = color::black(); let black = color::transparent_black();
// TODO: Use equality operators when we sync with rust-azure. if element_bg_color != black {
if element_bg_color.r != black.r || element_bg_color.g != black.g ||
element_bg_color.b != black.b || element_bg_color.a != black.a {
color = element_bg_color; color = element_bg_color;
break; break;