| 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 #ifndef CC_ANIMATION_SCROLLBAR_ANIMATION_CONTROLLER_LINEAR_FADE_H_ | 5 #ifndef CC_ANIMATION_SCROLLBAR_ANIMATION_CONTROLLER_LINEAR_FADE_H_ |
| 6 #define CC_ANIMATION_SCROLLBAR_ANIMATION_CONTROLLER_LINEAR_FADE_H_ | 6 #define CC_ANIMATION_SCROLLBAR_ANIMATION_CONTROLLER_LINEAR_FADE_H_ |
| 7 | 7 |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "cc/animation/scrollbar_animation_controller.h" | 9 #include "cc/animation/scrollbar_animation_controller.h" |
| 10 #include "cc/base/cc_export.h" | 10 #include "cc/base/cc_export.h" |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 base::TimeDelta delay_before_starting, | 33 base::TimeDelta delay_before_starting, |
| 34 base::TimeDelta resize_delay_before_starting, | 34 base::TimeDelta resize_delay_before_starting, |
| 35 base::TimeDelta duration); | 35 base::TimeDelta duration); |
| 36 | 36 |
| 37 void RunAnimationFrame(float progress) override; | 37 void RunAnimationFrame(float progress) override; |
| 38 | 38 |
| 39 private: | 39 private: |
| 40 float OpacityAtTime(base::TimeTicks now) const; | 40 float OpacityAtTime(base::TimeTicks now) const; |
| 41 void ApplyOpacityToScrollbars(float opacity); | 41 void ApplyOpacityToScrollbars(float opacity); |
| 42 | 42 |
| 43 LayerImpl* scroll_layer_; | |
| 44 | |
| 45 DISALLOW_COPY_AND_ASSIGN(ScrollbarAnimationControllerLinearFade); | 43 DISALLOW_COPY_AND_ASSIGN(ScrollbarAnimationControllerLinearFade); |
| 46 }; | 44 }; |
| 47 | 45 |
| 48 } // namespace cc | 46 } // namespace cc |
| 49 | 47 |
| 50 #endif // CC_ANIMATION_SCROLLBAR_ANIMATION_CONTROLLER_LINEAR_FADE_H_ | 48 #endif // CC_ANIMATION_SCROLLBAR_ANIMATION_CONTROLLER_LINEAR_FADE_H_ |
| OLD | NEW |