OLD | NEW |
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/animation/scrollbar_animation_controller_linear_fade.h" | 5 #include "cc/animation/scrollbar_animation_controller_linear_fade.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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
55 void ScrollbarAnimationControllerLinearFade::ApplyOpacityToScrollbars( | 55 void ScrollbarAnimationControllerLinearFade::ApplyOpacityToScrollbars( |
56 float opacity) { | 56 float opacity) { |
57 if (!scroll_layer_->scrollbars()) | 57 if (!scroll_layer_->scrollbars()) |
58 return; | 58 return; |
59 | 59 |
60 LayerImpl::ScrollbarSet* scrollbars = scroll_layer_->scrollbars(); | 60 LayerImpl::ScrollbarSet* scrollbars = scroll_layer_->scrollbars(); |
61 for (LayerImpl::ScrollbarSet::iterator it = scrollbars->begin(); | 61 for (LayerImpl::ScrollbarSet::iterator it = scrollbars->begin(); |
62 it != scrollbars->end(); | 62 it != scrollbars->end(); |
63 ++it) { | 63 ++it) { |
64 ScrollbarLayerImplBase* scrollbar = *it; | 64 ScrollbarLayerImplBase* scrollbar = *it; |
| 65 |
65 if (scrollbar->is_overlay_scrollbar()) | 66 if (scrollbar->is_overlay_scrollbar()) |
66 scrollbar->SetOpacity(opacity); | 67 scrollbar->SetOpacity(scrollbar->CanScrollOrientation() ? opacity : 0); |
67 } | 68 } |
68 } | 69 } |
69 | 70 |
70 } // namespace cc | 71 } // namespace cc |
OLD | NEW |