| 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..229e7f29c2a4b862b688cb8aa2a7ef614c60410d 100644
|
| --- a/cc/layers/painted_scrollbar_layer_impl.cc
|
| +++ b/cc/layers/painted_scrollbar_layer_impl.cc
|
| @@ -32,12 +32,12 @@ PaintedScrollbarLayerImpl::PaintedScrollbarLayerImpl(
|
| : ScrollbarLayerImplBase(tree_impl, id, orientation, false, false),
|
| track_ui_resource_id_(0),
|
| thumb_ui_resource_id_(0),
|
| + 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 +62,8 @@ 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_thumb_opacity(thumb_opacity_);
|
| }
|
|
|
| bool PaintedScrollbarLayerImpl::WillDraw(DrawMode draw_mode,
|
| @@ -102,7 +104,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,
|
|
|