Index: cc/layers/texture_layer_impl.cc |
diff --git a/cc/layers/texture_layer_impl.cc b/cc/layers/texture_layer_impl.cc |
index ce5251d5c91d1380100c6472f8cb30075206fc8f..a1f4beeed8b7cb1d9f95a95bfedff2fb2c2050fd 100644 |
--- a/cc/layers/texture_layer_impl.cc |
+++ b/cc/layers/texture_layer_impl.cc |
@@ -19,6 +19,7 @@ TextureLayerImpl::TextureLayerImpl(LayerTreeImpl* tree_impl, |
texture_id_(0), |
external_texture_resource_(0), |
premultiplied_alpha_(true), |
+ blend_background_color_(false), |
flipped_(true), |
uv_top_left_(0.f, 0.f), |
uv_bottom_right_(1.f, 1.f), |
@@ -104,8 +105,11 @@ void TextureLayerImpl::AppendQuads(QuadSink* quad_sink, |
quad_sink->UseSharedQuadState(CreateSharedQuadState()); |
AppendDebugBorderQuad(quad_sink, shared_quad_state, append_quads_data); |
+ SkColor bg_color = blend_background_color_ ? |
+ background_color() : SK_ColorTRANSPARENT; |
gfx::Rect quad_rect(content_bounds()); |
- gfx::Rect opaque_rect(contents_opaque() ? quad_rect : gfx::Rect()); |
+ gfx::Rect opaque_rect = contents_opaque() || (SkColorGetA(bg_color) == 0xFF) ? |
palmer
2013/07/11 18:37:22
I don't understand this. It looks like it will try
alokp
2013/07/11 19:55:00
I do not think so, but would you prefer enclosing
danakj
2013/07/11 20:34:05
How about a temp var for the boolean part
alokp
2013/07/11 20:42:33
Done.
|
+ quad_rect : gfx::Rect(); |
scoped_ptr<TextureDrawQuad> quad = TextureDrawQuad::Create(); |
quad->SetNew(shared_quad_state, |
quad_rect, |
@@ -114,6 +118,7 @@ void TextureLayerImpl::AppendQuads(QuadSink* quad_sink, |
premultiplied_alpha_, |
uv_top_left_, |
uv_bottom_right_, |
+ bg_color, |
vertex_opacity_, |
flipped_); |