From 2c7edeb2bf0c4aebfd1bcde2077f1507ff812d02 Mon Sep 17 00:00:00 2001 From: Adenilson Cavalcanti Date: Wed, 22 Apr 2015 14:51:39 -0700 Subject: [PATCH] Renaming the color function to just *transparent*, as suggested on review. --- components/compositing/compositor.rs | 2 +- components/gfx/color.rs | 2 +- components/gfx/paint_context.rs | 2 +- components/layout/display_list_builder.rs | 2 +- components/layout/layout_task.rs | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs index 7ddfd045b783..8e42eb7a9e28 100644 --- a/components/compositing/compositor.rs +++ b/components/compositing/compositor.rs @@ -548,7 +548,7 @@ impl IOCompositor { epoch: Epoch(0), id: LayerId::null(), rect: Rect::zero(), - background_color: color::transparent_black(), + background_color: color::transparent(), scroll_policy: ScrollPolicy::Scrollable, }; diff --git a/components/gfx/color.rs b/components/gfx/color.rs index a91c6818ee61..a128d364432f 100644 --- a/components/gfx/color.rs +++ b/components/gfx/color.rs @@ -31,7 +31,7 @@ pub fn black() -> AzColor { } #[inline] -pub fn transparent_black() -> AzColor { +pub fn transparent() -> AzColor { AzColor { r: 0.0, g: 0.0, b: 0.0, a: 0.0 } } diff --git a/components/gfx/paint_context.rs b/components/gfx/paint_context.rs index be289eb940f0..93c7604c3d95 100644 --- a/components/gfx/paint_context.rs +++ b/components/gfx/paint_context.rs @@ -169,7 +169,7 @@ impl<'a> PaintContext<'a> { } pub fn clear(&self) { - let pattern = ColorPattern::new(color::transparent_black()); + let pattern = ColorPattern::new(color::transparent()); let rect = Rect(Point2D(self.page_rect.origin.x as AzFloat, self.page_rect.origin.y as AzFloat), Size2D(self.screen_rect.size.width as AzFloat, diff --git a/components/layout/display_list_builder.rs b/components/layout/display_list_builder.rs index d4eea71b1834..c03fc6aab1dd 100644 --- a/components/layout/display_list_builder.rs +++ b/components/layout/display_list_builder.rs @@ -1318,7 +1318,7 @@ impl BlockFlowDisplayListBuilding for BlockFlow { ScrollPolicy::Scrollable }; - let transparent = color::transparent_black(); + let transparent = color::transparent(); let stacking_context = self.create_stacking_context(display_list, Some(Arc::new(PaintLayer::new(self.layer_id(0), diff --git a/components/layout/layout_task.rs b/components/layout/layout_task.rs index 054b8f51dc9e..068b97d6d0a9 100644 --- a/components/layout/layout_task.rs +++ b/components/layout/layout_task.rs @@ -1226,16 +1226,16 @@ impl FragmentBorderBoxIterator for CollectingFragmentBorderBoxIterator { // transparent background color is handled correctly. fn get_root_flow_background_color(flow: &mut Flow) -> AzColor { if !flow.is_block_like() { - return color::transparent_black() + return color::transparent() } let block_flow = flow.as_block(); let kid = match block_flow.base.children.iter_mut().next() { - None => return color::transparent_black(), + None => return color::transparent(), Some(kid) => kid, }; if !kid.is_block_like() { - return color::transparent_black() + return color::transparent() } let kid_block_flow = kid.as_block();