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

Side by Side Diff: cc/animation/scrollbar_animation_controller_thinning.cc

Issue 637283004: Fix CanScrollOrientation method name. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
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/animation/scrollbar_animation_controller_thinning.h" 5 #include "cc/animation/scrollbar_animation_controller_thinning.h"
6 6
7 #include "base/time/time.h" 7 #include "base/time/time.h"
8 #include "cc/layers/layer_impl.h" 8 #include "cc/layers/layer_impl.h"
9 #include "cc/layers/scrollbar_layer_impl_base.h" 9 #include "cc/layers/scrollbar_layer_impl_base.h"
10 10
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 if (!scroll_layer_->scrollbars()) 139 if (!scroll_layer_->scrollbars())
140 return; 140 return;
141 141
142 LayerImpl::ScrollbarSet* scrollbars = scroll_layer_->scrollbars(); 142 LayerImpl::ScrollbarSet* scrollbars = scroll_layer_->scrollbars();
143 for (LayerImpl::ScrollbarSet::iterator it = scrollbars->begin(); 143 for (LayerImpl::ScrollbarSet::iterator it = scrollbars->begin();
144 it != scrollbars->end(); 144 it != scrollbars->end();
145 ++it) { 145 ++it) {
146 ScrollbarLayerImplBase* scrollbar = *it; 146 ScrollbarLayerImplBase* scrollbar = *it;
147 if (scrollbar->is_overlay_scrollbar()) { 147 if (scrollbar->is_overlay_scrollbar()) {
148 float effectiveOpacity = 148 float effectiveOpacity =
149 scrollbar->can_scroll_orientation() 149 scrollbar->CanScrollOrientation()
150 ? AdjustScale(opacity, scrollbar->opacity(), opacity_change_) 150 ? AdjustScale(opacity, scrollbar->opacity(), opacity_change_)
151 : 0; 151 : 0;
152 152
153 scrollbar->SetOpacity(effectiveOpacity); 153 scrollbar->SetOpacity(effectiveOpacity);
154 scrollbar->SetThumbThicknessScaleFactor( 154 scrollbar->SetThumbThicknessScaleFactor(
155 AdjustScale(thumb_thickness_scale, 155 AdjustScale(thumb_thickness_scale,
156 scrollbar->thumb_thickness_scale_factor(), 156 scrollbar->thumb_thickness_scale_factor(),
157 thickness_change_)); 157 thickness_change_));
158 } 158 }
159 } 159 }
160 } 160 }
161 161
162 } // namespace cc 162 } // namespace cc
OLDNEW
« no previous file with comments | « cc/animation/scrollbar_animation_controller_linear_fade.cc ('k') | cc/layers/scrollbar_layer_impl_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698