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

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

Issue 608223002: [Android]Increase Scrollbar fade delay on Resize. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: addressed review comments 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 #ifndef CC_ANIMATION_SCROLLBAR_ANIMATION_CONTROLLER_THINNING_H_ 5 #ifndef CC_ANIMATION_SCROLLBAR_ANIMATION_CONTROLLER_THINNING_H_
6 #define CC_ANIMATION_SCROLLBAR_ANIMATION_CONTROLLER_THINNING_H_ 6 #define CC_ANIMATION_SCROLLBAR_ANIMATION_CONTROLLER_THINNING_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"
11 11
12 namespace cc { 12 namespace cc {
13 class LayerImpl; 13 class LayerImpl;
14 14
15 // Scrollbar animation that partially fades and thins after an idle delay, 15 // Scrollbar animation that partially fades and thins after an idle delay,
16 // and reacts to mouse movements. 16 // and reacts to mouse movements.
17 class CC_EXPORT ScrollbarAnimationControllerThinning 17 class CC_EXPORT ScrollbarAnimationControllerThinning
18 : public ScrollbarAnimationController { 18 : public ScrollbarAnimationController {
19 public: 19 public:
20 static scoped_ptr<ScrollbarAnimationControllerThinning> Create( 20 static scoped_ptr<ScrollbarAnimationControllerThinning> Create(
21 LayerImpl* scroll_layer, 21 LayerImpl* scroll_layer,
22 ScrollbarAnimationControllerClient* client, 22 ScrollbarAnimationControllerClient* client,
23 base::TimeDelta delay_before_starting, 23 base::TimeDelta delay_before_starting,
24 base::TimeDelta resize_delay_before_starting,
24 base::TimeDelta duration); 25 base::TimeDelta duration);
25 26
26 virtual ~ScrollbarAnimationControllerThinning(); 27 virtual ~ScrollbarAnimationControllerThinning();
27 28
28 void set_mouse_move_distance_for_test(float distance) { 29 void set_mouse_move_distance_for_test(float distance) {
29 mouse_move_distance_to_trigger_animation_ = distance; 30 mouse_move_distance_to_trigger_animation_ = distance;
30 } 31 }
31 bool mouse_is_over_scrollbar() const { return mouse_is_over_scrollbar_; } 32 bool mouse_is_over_scrollbar() const { return mouse_is_over_scrollbar_; }
32 bool mouse_is_near_scrollbar() const { return mouse_is_near_scrollbar_; } 33 bool mouse_is_near_scrollbar() const { return mouse_is_near_scrollbar_; }
33 34
34 virtual void DidScrollUpdate() OVERRIDE; 35 virtual void DidScrollUpdate(bool on_resize = false) OVERRIDE;
aelias_OOO_until_Jul13 2014/09/30 18:55:27 Please remove this default argument.
35 virtual void DidMouseMoveOffScrollbar() OVERRIDE; 36 virtual void DidMouseMoveOffScrollbar() OVERRIDE;
36 virtual void DidMouseMoveNear(float distance) OVERRIDE; 37 virtual void DidMouseMoveNear(float distance) OVERRIDE;
37 38
38 protected: 39 protected:
39 ScrollbarAnimationControllerThinning( 40 ScrollbarAnimationControllerThinning(
40 LayerImpl* scroll_layer, 41 LayerImpl* scroll_layer,
41 ScrollbarAnimationControllerClient* client, 42 ScrollbarAnimationControllerClient* client,
42 base::TimeDelta delay_before_starting, 43 base::TimeDelta delay_before_starting,
44 base::TimeDelta resize_delay_before_starting,
43 base::TimeDelta duration); 45 base::TimeDelta duration);
44 46
45 virtual void RunAnimationFrame(float progress) OVERRIDE; 47 virtual void RunAnimationFrame(float progress) OVERRIDE;
46 48
47 private: 49 private:
48 // Describes whether the current animation should INCREASE (darken / thicken) 50 // Describes whether the current animation should INCREASE (darken / thicken)
49 // a bar or DECREASE it (lighten / thin). 51 // a bar or DECREASE it (lighten / thin).
50 enum AnimationChange { 52 enum AnimationChange {
51 NONE, 53 NONE,
52 INCREASE, 54 INCREASE,
(...skipping 17 matching lines...) Expand all
70 AnimationChange opacity_change_; 72 AnimationChange opacity_change_;
71 // How close should the mouse be to the scrollbar before we thicken it. 73 // How close should the mouse be to the scrollbar before we thicken it.
72 float mouse_move_distance_to_trigger_animation_; 74 float mouse_move_distance_to_trigger_animation_;
73 75
74 DISALLOW_COPY_AND_ASSIGN(ScrollbarAnimationControllerThinning); 76 DISALLOW_COPY_AND_ASSIGN(ScrollbarAnimationControllerThinning);
75 }; 77 };
76 78
77 } // namespace cc 79 } // namespace cc
78 80
79 #endif // CC_ANIMATION_SCROLLBAR_ANIMATION_CONTROLLER_THINNING_H_ 81 #endif // CC_ANIMATION_SCROLLBAR_ANIMATION_CONTROLLER_THINNING_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698