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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/layers/painted_scrollbar_layer_impl.h" 5 #include "cc/layers/painted_scrollbar_layer_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "cc/animation/scrollbar_animation_controller.h" 9 #include "cc/animation/scrollbar_animation_controller.h"
10 #include "cc/layers/layer.h" 10 #include "cc/layers/layer.h"
(...skipping 14 matching lines...) Expand all
25 new PaintedScrollbarLayerImpl(tree_impl, id, orientation)); 25 new PaintedScrollbarLayerImpl(tree_impl, id, orientation));
26 } 26 }
27 27
28 PaintedScrollbarLayerImpl::PaintedScrollbarLayerImpl( 28 PaintedScrollbarLayerImpl::PaintedScrollbarLayerImpl(
29 LayerTreeImpl* tree_impl, 29 LayerTreeImpl* tree_impl,
30 int id, 30 int id,
31 ScrollbarOrientation orientation) 31 ScrollbarOrientation orientation)
32 : ScrollbarLayerImplBase(tree_impl, id, orientation, false, false), 32 : ScrollbarLayerImplBase(tree_impl, id, orientation, false, false),
33 track_ui_resource_id_(0), 33 track_ui_resource_id_(0),
34 thumb_ui_resource_id_(0), 34 thumb_ui_resource_id_(0),
35 track_opacity_(1.f),
36 thumb_opacity_(1.f),
35 internal_contents_scale_(1.f), 37 internal_contents_scale_(1.f),
36 thumb_thickness_(0), 38 thumb_thickness_(0),
37 thumb_length_(0), 39 thumb_length_(0),
38 track_start_(0), 40 track_start_(0),
39 track_length_(0) { 41 track_length_(0) {}
40 }
41 42
42 PaintedScrollbarLayerImpl::~PaintedScrollbarLayerImpl() {} 43 PaintedScrollbarLayerImpl::~PaintedScrollbarLayerImpl() {}
43 44
44 scoped_ptr<LayerImpl> PaintedScrollbarLayerImpl::CreateLayerImpl( 45 scoped_ptr<LayerImpl> PaintedScrollbarLayerImpl::CreateLayerImpl(
45 LayerTreeImpl* tree_impl) { 46 LayerTreeImpl* tree_impl) {
46 return PaintedScrollbarLayerImpl::Create(tree_impl, id(), orientation()); 47 return PaintedScrollbarLayerImpl::Create(tree_impl, id(), orientation());
47 } 48 }
48 49
49 void PaintedScrollbarLayerImpl::PushPropertiesTo(LayerImpl* layer) { 50 void PaintedScrollbarLayerImpl::PushPropertiesTo(LayerImpl* layer) {
50 ScrollbarLayerImplBase::PushPropertiesTo(layer); 51 ScrollbarLayerImplBase::PushPropertiesTo(layer);
51 52
52 PaintedScrollbarLayerImpl* scrollbar_layer = 53 PaintedScrollbarLayerImpl* scrollbar_layer =
53 static_cast<PaintedScrollbarLayerImpl*>(layer); 54 static_cast<PaintedScrollbarLayerImpl*>(layer);
54 55
55 scrollbar_layer->set_internal_contents_scale_and_bounds( 56 scrollbar_layer->set_internal_contents_scale_and_bounds(
56 internal_contents_scale_, internal_content_bounds_); 57 internal_contents_scale_, internal_content_bounds_);
57 58
58 scrollbar_layer->SetThumbThickness(thumb_thickness_); 59 scrollbar_layer->SetThumbThickness(thumb_thickness_);
59 scrollbar_layer->SetThumbLength(thumb_length_); 60 scrollbar_layer->SetThumbLength(thumb_length_);
60 scrollbar_layer->SetTrackStart(track_start_); 61 scrollbar_layer->SetTrackStart(track_start_);
61 scrollbar_layer->SetTrackLength(track_length_); 62 scrollbar_layer->SetTrackLength(track_length_);
62 63
63 scrollbar_layer->set_track_ui_resource_id(track_ui_resource_id_); 64 scrollbar_layer->set_track_ui_resource_id(track_ui_resource_id_);
64 scrollbar_layer->set_thumb_ui_resource_id(thumb_ui_resource_id_); 65 scrollbar_layer->set_thumb_ui_resource_id(thumb_ui_resource_id_);
66
67 scrollbar_layer->set_track_opacity(track_opacity_);
68 scrollbar_layer->set_thumb_opacity(thumb_opacity_);
65 } 69 }
66 70
67 bool PaintedScrollbarLayerImpl::WillDraw(DrawMode draw_mode, 71 bool PaintedScrollbarLayerImpl::WillDraw(DrawMode draw_mode,
68 ResourceProvider* resource_provider) { 72 ResourceProvider* resource_provider) {
69 DCHECK(draw_mode != DRAW_MODE_RESOURCELESS_SOFTWARE); 73 DCHECK(draw_mode != DRAW_MODE_RESOURCELESS_SOFTWARE);
70 return LayerImpl::WillDraw(draw_mode, resource_provider); 74 return LayerImpl::WillDraw(draw_mode, resource_provider);
71 } 75 }
72 76
73 void PaintedScrollbarLayerImpl::AppendQuads( 77 void PaintedScrollbarLayerImpl::AppendQuads(
74 RenderPass* render_pass, 78 RenderPass* render_pass,
(...skipping 20 matching lines...) Expand all
95 gfx::Rect scaled_visible_thumb_quad_rect = gfx::ScaleToEnclosingRect( 99 gfx::Rect scaled_visible_thumb_quad_rect = gfx::ScaleToEnclosingRect(
96 visible_thumb_quad_rect, internal_contents_scale_); 100 visible_thumb_quad_rect, internal_contents_scale_);
97 101
98 ResourceId thumb_resource_id = 102 ResourceId thumb_resource_id =
99 layer_tree_impl()->ResourceIdForUIResource(thumb_ui_resource_id_); 103 layer_tree_impl()->ResourceIdForUIResource(thumb_ui_resource_id_);
100 ResourceId track_resource_id = 104 ResourceId track_resource_id =
101 layer_tree_impl()->ResourceIdForUIResource(track_ui_resource_id_); 105 layer_tree_impl()->ResourceIdForUIResource(track_ui_resource_id_);
102 106
103 if (thumb_resource_id && !visible_thumb_quad_rect.IsEmpty()) { 107 if (thumb_resource_id && !visible_thumb_quad_rect.IsEmpty()) {
104 gfx::Rect opaque_rect; 108 gfx::Rect opaque_rect;
105 const float opacity[] = {1.0f, 1.0f, 1.0f, 1.0f}; 109 const float opacity[] = {thumb_opacity_, thumb_opacity_, thumb_opacity_,
110 thumb_opacity_};
106 TextureDrawQuad* quad = 111 TextureDrawQuad* quad =
107 render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>(); 112 render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>();
108 quad->SetNew(shared_quad_state, scaled_thumb_quad_rect, opaque_rect, 113 quad->SetNew(shared_quad_state, scaled_thumb_quad_rect, opaque_rect,
109 scaled_visible_thumb_quad_rect, thumb_resource_id, 114 scaled_visible_thumb_quad_rect, thumb_resource_id,
110 premultipled_alpha, uv_top_left, uv_bottom_right, 115 premultipled_alpha, uv_top_left, uv_bottom_right,
111 SK_ColorTRANSPARENT, opacity, flipped, nearest_neighbor); 116 SK_ColorTRANSPARENT, opacity, flipped, nearest_neighbor);
112 ValidateQuadResources(quad); 117 ValidateQuadResources(quad);
113 } 118 }
114 119
115 gfx::Rect track_quad_rect(bounds()); 120 gfx::Rect track_quad_rect(bounds());
116 gfx::Rect scaled_track_quad_rect(internal_content_bounds_); 121 gfx::Rect scaled_track_quad_rect(internal_content_bounds_);
117 gfx::Rect visible_track_quad_rect = 122 gfx::Rect visible_track_quad_rect =
118 draw_properties().occlusion_in_content_space.GetUnoccludedContentRect( 123 draw_properties().occlusion_in_content_space.GetUnoccludedContentRect(
119 track_quad_rect); 124 track_quad_rect);
120 gfx::Rect scaled_visible_track_quad_rect = gfx::ScaleToEnclosingRect( 125 gfx::Rect scaled_visible_track_quad_rect = gfx::ScaleToEnclosingRect(
121 visible_track_quad_rect, internal_contents_scale_); 126 visible_track_quad_rect, internal_contents_scale_);
122 if (track_resource_id && !visible_track_quad_rect.IsEmpty()) { 127 if (track_resource_id && !visible_track_quad_rect.IsEmpty()) {
123 gfx::Rect opaque_rect(contents_opaque() ? scaled_track_quad_rect 128 gfx::Rect opaque_rect(contents_opaque() ? scaled_track_quad_rect
124 : gfx::Rect()); 129 : gfx::Rect());
125 const float opacity[] = {1.0f, 1.0f, 1.0f, 1.0f}; 130 const float opacity[] = {track_opacity_, track_opacity_, track_opacity_,
131 track_opacity_};
126 TextureDrawQuad* quad = 132 TextureDrawQuad* quad =
127 render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>(); 133 render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>();
128 quad->SetNew(shared_quad_state, scaled_track_quad_rect, opaque_rect, 134 quad->SetNew(shared_quad_state, scaled_track_quad_rect, opaque_rect,
129 scaled_visible_track_quad_rect, track_resource_id, 135 scaled_visible_track_quad_rect, track_resource_id,
130 premultipled_alpha, uv_top_left, uv_bottom_right, 136 premultipled_alpha, uv_top_left, uv_bottom_right,
131 SK_ColorTRANSPARENT, opacity, flipped, nearest_neighbor); 137 SK_ColorTRANSPARENT, opacity, flipped, nearest_neighbor);
132 ValidateQuadResources(quad); 138 ValidateQuadResources(quad);
133 } 139 }
134 } 140 }
135 141
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 192
187 bool PaintedScrollbarLayerImpl::IsThumbResizable() const { 193 bool PaintedScrollbarLayerImpl::IsThumbResizable() const {
188 return false; 194 return false;
189 } 195 }
190 196
191 const char* PaintedScrollbarLayerImpl::LayerTypeAsString() const { 197 const char* PaintedScrollbarLayerImpl::LayerTypeAsString() const {
192 return "cc::PaintedScrollbarLayerImpl"; 198 return "cc::PaintedScrollbarLayerImpl";
193 } 199 }
194 200
195 } // namespace cc 201 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698