Auto merge of #5787 - Adenilson:colorWhite01, r=SimonSapin

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5787)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-04-22 17:04:41 -05:00
commit f9a50c9be0
5 changed files with 7 additions and 7 deletions

View file

@ -1318,7 +1318,7 @@ impl BlockFlowDisplayListBuilding for BlockFlow {
ScrollPolicy::Scrollable
};
let transparent = color::rgba(1.0, 1.0, 1.0, 0.0);
let transparent = color::transparent();
let stacking_context =
self.create_stacking_context(display_list,
Some(Arc::new(PaintLayer::new(self.layer_id(0),

View file

@ -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();