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

Side by Side Diff: cc/layers/scrollbar_layer.cc

Issue 23102003: Note scrollbar layer properties changed when position changes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 4 months 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 | Annotate | Revision Log
« no previous file with comments | « cc/layers/layer_impl.cc ('k') | cc/layers/scrollbar_layer_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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/scrollbar_layer.h" 5 #include "cc/layers/scrollbar_layer.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "cc/layers/scrollbar_layer_impl.h" 10 #include "cc/layers/scrollbar_layer_impl.h"
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 void ScrollbarLayer::PushPropertiesTo(LayerImpl* layer) { 103 void ScrollbarLayer::PushPropertiesTo(LayerImpl* layer) {
104 ContentsScalingLayer::PushPropertiesTo(layer); 104 ContentsScalingLayer::PushPropertiesTo(layer);
105 105
106 ScrollbarLayerImpl* scrollbar_layer = static_cast<ScrollbarLayerImpl*>(layer); 106 ScrollbarLayerImpl* scrollbar_layer = static_cast<ScrollbarLayerImpl*>(layer);
107 107
108 if (layer_tree_host() && 108 if (layer_tree_host() &&
109 layer_tree_host()->settings().solid_color_scrollbars) { 109 layer_tree_host()->settings().solid_color_scrollbars) {
110 int thickness_override = 110 int thickness_override =
111 layer_tree_host()->settings().solid_color_scrollbar_thickness_dip; 111 layer_tree_host()->settings().solid_color_scrollbar_thickness_dip;
112 if (thickness_override != -1) { 112 if (thickness_override != -1) {
113 scrollbar_layer->set_thumb_thickness(thickness_override); 113 scrollbar_layer->SetThumbThickness(thickness_override);
114 } else { 114 } else {
115 if (Orientation() == HORIZONTAL) 115 if (Orientation() == HORIZONTAL)
116 scrollbar_layer->set_thumb_thickness(bounds().height()); 116 scrollbar_layer->SetThumbThickness(bounds().height());
117 else 117 else
118 scrollbar_layer->set_thumb_thickness(bounds().width()); 118 scrollbar_layer->SetThumbThickness(bounds().width());
119 } 119 }
120 } else { 120 } else {
121 scrollbar_layer->set_thumb_thickness(thumb_thickness_); 121 scrollbar_layer->SetThumbThickness(thumb_thickness_);
122 } 122 }
123 scrollbar_layer->set_thumb_length(thumb_length_); 123 scrollbar_layer->SetThumbLength(thumb_length_);
124 if (Orientation() == HORIZONTAL) { 124 if (Orientation() == HORIZONTAL) {
125 scrollbar_layer->set_track_start(track_rect_.x()); 125 scrollbar_layer->SetTrackStart(track_rect_.x());
126 scrollbar_layer->set_track_length(track_rect_.width()); 126 scrollbar_layer->SetTrackLength(track_rect_.width());
127 } else { 127 } else {
128 scrollbar_layer->set_track_start(track_rect_.y()); 128 scrollbar_layer->SetTrackStart(track_rect_.y());
129 scrollbar_layer->set_track_length(track_rect_.height()); 129 scrollbar_layer->SetTrackLength(track_rect_.height());
130 } 130 }
131 131
132 if (track_resource_.get()) 132 if (track_resource_.get())
133 scrollbar_layer->set_track_ui_resource_id(track_resource_->id()); 133 scrollbar_layer->set_track_ui_resource_id(track_resource_->id());
134 if (thumb_resource_.get()) 134 if (thumb_resource_.get())
135 scrollbar_layer->set_thumb_ui_resource_id(thumb_resource_->id()); 135 scrollbar_layer->set_thumb_ui_resource_id(thumb_resource_->id());
136 136
137 scrollbar_layer->set_is_overlay_scrollbar(scrollbar_->IsOverlay()); 137 scrollbar_layer->set_is_overlay_scrollbar(scrollbar_->IsOverlay());
138 138
139 // ScrollbarLayer must push properties every frame. crbug.com/259095 139 // ScrollbarLayer must push properties every frame. crbug.com/259095
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 paint.setXfermodeMode(SkXfermode::kClear_Mode); 238 paint.setXfermodeMode(SkXfermode::kClear_Mode);
239 skcanvas.drawRect(layer_skrect, paint); 239 skcanvas.drawRect(layer_skrect, paint);
240 skcanvas.clipRect(layer_skrect); 240 skcanvas.clipRect(layer_skrect);
241 241
242 scrollbar_->PaintPart(&skcanvas, part, layer_rect); 242 scrollbar_->PaintPart(&skcanvas, part, layer_rect);
243 243
244 return bitmap; 244 return bitmap;
245 } 245 }
246 246
247 } // namespace cc 247 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/layer_impl.cc ('k') | cc/layers/scrollbar_layer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698