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

Unified Diff: cc/layers/painted_scrollbar_layer.cc

Issue 23112020: Remove solid_color_scrollbar_thickness_dip from LayerTreeSettings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | cc/layers/scrollbar_layer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/painted_scrollbar_layer.cc
diff --git a/cc/layers/painted_scrollbar_layer.cc b/cc/layers/painted_scrollbar_layer.cc
index 8346d04cf24a25991de30c04553b9d7bd724d1d7..f2c3e450bd89177d9f62e45b267a161173a4badd 100644
--- a/cc/layers/painted_scrollbar_layer.cc
+++ b/cc/layers/painted_scrollbar_layer.cc
@@ -109,16 +109,7 @@ void PaintedScrollbarLayer::PushPropertiesTo(LayerImpl* layer) {
if (layer_tree_host() &&
layer_tree_host()->settings().solid_color_scrollbars) {
- int thickness_override =
- layer_tree_host()->settings().solid_color_scrollbar_thickness_dip;
- if (thickness_override != -1) {
- scrollbar_layer->SetThumbThickness(thickness_override);
- } else {
- if (Orientation() == HORIZONTAL)
- scrollbar_layer->SetThumbThickness(bounds().height());
- else
- scrollbar_layer->SetThumbThickness(bounds().width());
- }
+ scrollbar_layer->SetThumbThickness(scrollbar_->ThumbThickness());
} else {
scrollbar_layer->SetThumbThickness(thumb_thickness_);
}
« no previous file with comments | « no previous file | cc/layers/scrollbar_layer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698