Index: cc/layers/painted_scrollbar_layer_impl.cc |
diff --git a/cc/layers/painted_scrollbar_layer_impl.cc b/cc/layers/painted_scrollbar_layer_impl.cc |
index 0b5b5801dd61cc003c90fcb07aed1b5030052fc6..4292d326ec8673600ef38e9567021b64168c5ff9 100644 |
--- a/cc/layers/painted_scrollbar_layer_impl.cc |
+++ b/cc/layers/painted_scrollbar_layer_impl.cc |
@@ -32,12 +32,13 @@ PaintedScrollbarLayerImpl::PaintedScrollbarLayerImpl( |
: ScrollbarLayerImplBase(tree_impl, id, orientation, false, false), |
track_ui_resource_id_(0), |
thumb_ui_resource_id_(0), |
+ track_opacity_(1.f), |
+ thumb_opacity_(1.f), |
internal_contents_scale_(1.f), |
thumb_thickness_(0), |
thumb_length_(0), |
track_start_(0), |
- track_length_(0) { |
-} |
+ track_length_(0) {} |
PaintedScrollbarLayerImpl::~PaintedScrollbarLayerImpl() {} |
@@ -62,6 +63,9 @@ void PaintedScrollbarLayerImpl::PushPropertiesTo(LayerImpl* layer) { |
scrollbar_layer->set_track_ui_resource_id(track_ui_resource_id_); |
scrollbar_layer->set_thumb_ui_resource_id(thumb_ui_resource_id_); |
+ |
+ scrollbar_layer->set_track_opacity(track_opacity_); |
+ scrollbar_layer->set_thumb_opacity(thumb_opacity_); |
} |
bool PaintedScrollbarLayerImpl::WillDraw(DrawMode draw_mode, |
@@ -102,7 +106,8 @@ void PaintedScrollbarLayerImpl::AppendQuads( |
if (thumb_resource_id && !visible_thumb_quad_rect.IsEmpty()) { |
gfx::Rect opaque_rect; |
- const float opacity[] = {1.0f, 1.0f, 1.0f, 1.0f}; |
+ const float opacity[] = {thumb_opacity_, thumb_opacity_, thumb_opacity_, |
+ thumb_opacity_}; |
TextureDrawQuad* quad = |
render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>(); |
quad->SetNew(shared_quad_state, scaled_thumb_quad_rect, opaque_rect, |
@@ -122,7 +127,8 @@ void PaintedScrollbarLayerImpl::AppendQuads( |
if (track_resource_id && !visible_track_quad_rect.IsEmpty()) { |
gfx::Rect opaque_rect(contents_opaque() ? scaled_track_quad_rect |
: gfx::Rect()); |
- const float opacity[] = {1.0f, 1.0f, 1.0f, 1.0f}; |
+ const float opacity[] = {track_opacity_, track_opacity_, track_opacity_, |
+ track_opacity_}; |
TextureDrawQuad* quad = |
render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>(); |
quad->SetNew(shared_quad_state, scaled_track_quad_rect, opaque_rect, |