Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(390)

Unified Diff: cc/layers/painted_scrollbar_layer_impl.cc

Issue 1458703010: Mac: Don't repaint scrollbars every frame (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master2
Patch Set: Sprinkle in some tests Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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,

Powered by Google App Engine
This is Rietveld 408576698