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

Side by Side Diff: content/browser/android/overscroll_glow.h

Issue 367173003: [Android] Implementation of overscroll effect for Android L (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Code review Created 6 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 unified diff | Download patch
« no previous file with comments | « content/browser/android/edge_effect_l.cc ('k') | content/browser/android/overscroll_glow.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 CONTENT_BROWSER_ANDROID_OVERSCROLL_GLOW_H_ 5 #ifndef CONTENT_BROWSER_ANDROID_OVERSCROLL_GLOW_H_
6 #define CONTENT_BROWSER_ANDROID_OVERSCROLL_GLOW_H_ 6 #define CONTENT_BROWSER_ANDROID_OVERSCROLL_GLOW_H_
7 7
8 #include "base/callback.h"
8 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
9 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
10 #include "base/time/time.h" 11 #include "base/time/time.h"
11 #include "content/browser/android/edge_effect.h"
12 #include "ui/gfx/size_f.h" 12 #include "ui/gfx/size_f.h"
13 #include "ui/gfx/vector2d_f.h" 13 #include "ui/gfx/vector2d_f.h"
14 14
15 class SkBitmap; 15 namespace cc {
16 16 class Layer;
17 namespace ui {
18 class SystemUIResourceManager;
19 } 17 }
20 18
21 namespace content { 19 namespace content {
22 20
21 class EdgeEffectBase;
22
23 /* |OverscrollGlow| mirrors its Android counterpart, OverscrollGlow.java. 23 /* |OverscrollGlow| mirrors its Android counterpart, OverscrollGlow.java.
24 * Conscious tradeoffs were made to align this as closely as possible with the 24 * Conscious tradeoffs were made to align this as closely as possible with the
25 * original Android Java version. 25 * original Android Java version.
26 */ 26 */
27 class OverscrollGlow { 27 class OverscrollGlow {
28 public: 28 public:
29 // Create a new effect. |resource_manager| provides the resource for the 29 enum Edge { EDGE_TOP = 0, EDGE_LEFT, EDGE_BOTTOM, EDGE_RIGHT, EDGE_COUNT };
30 // effect. |resource_manager| must outlive the effect. The effect is 30
31 // activated by default. 31 // Allows lazy creation of the edge effects.
32 static scoped_ptr<OverscrollGlow> Create( 32 typedef base::Callback<scoped_ptr<EdgeEffectBase>(void)> EdgeEffectProvider;
33 ui::SystemUIResourceManager* resource_manager); 33
34 // |edge_effect_provider| must be valid for the duration of the effect's
35 // lifetime. The effect is enabled by default, but will remain dormant until
36 // the first overscroll event.
37 explicit OverscrollGlow(const EdgeEffectProvider& edge_effect_provider);
34 38
35 ~OverscrollGlow(); 39 ~OverscrollGlow();
36 40
37 // Enable the effect. If the effect was previously disabled, it will remain 41 // Enable the effect. If the effect was previously disabled, it will remain
38 // dormant until subsequent calls to |OnOverscrolled()|. 42 // dormant until subsequent calls to |OnOverscrolled()|.
39 void Enable(); 43 void Enable();
40 44
41 // Deactivate and detach the effect. Subsequent calls to |OnOverscrolled()| or 45 // Deactivate and detach the effect. Subsequent calls to |OnOverscrolled()| or
42 // |Animate()| will have no effect. 46 // |Animate()| will have no effect.
43 void Disable(); 47 void Disable();
44 48
45 // Effect layers will be attached to |overscrolling_layer| if necessary. 49 // Effect layers will be attached to |overscrolling_layer| if necessary.
46 // |accumulated_overscroll| and |overscroll_delta| are in device pixels, while 50 // |accumulated_overscroll| and |overscroll_delta| are in device pixels, while
47 // |velocity| is in device pixels / second. 51 // |velocity| is in device pixels / second.
48 // Returns true if the effect still needs animation ticks. 52 // Returns true if the effect still needs animation ticks.
49 bool OnOverscrolled(cc::Layer* overscrolling_layer, 53 bool OnOverscrolled(cc::Layer* overscrolling_layer,
50 base::TimeTicks current_time, 54 base::TimeTicks current_time,
51 gfx::Vector2dF accumulated_overscroll, 55 gfx::Vector2dF accumulated_overscroll,
52 gfx::Vector2dF overscroll_delta, 56 gfx::Vector2dF overscroll_delta,
53 gfx::Vector2dF velocity); 57 gfx::Vector2dF velocity,
58 gfx::Vector2dF overscroll_location);
54 59
55 // Returns true if the effect still needs animation ticks. 60 // Returns true if the effect still needs animation ticks.
56 // Note: The effect will detach itself when no further animation is required. 61 // Note: The effect will detach itself when no further animation is required.
57 bool Animate(base::TimeTicks current_time); 62 bool Animate(base::TimeTicks current_time);
58 63
59 // Update the effect according to the most recent display parameters, 64 // Update the effect according to the most recent display parameters,
60 // Note: All dimensions are in device pixels. 65 // Note: All dimensions are in device pixels.
61 struct DisplayParameters { 66 struct DisplayParameters {
62 DisplayParameters(); 67 DisplayParameters();
63 gfx::SizeF size; 68 gfx::SizeF size;
64 float edge_offsets[EdgeEffect::EDGE_COUNT]; 69 float edge_offsets[EDGE_COUNT];
65 float device_scale_factor;
66 }; 70 };
67 void UpdateDisplayParameters(const DisplayParameters& params); 71 void UpdateDisplayParameters(const DisplayParameters& params);
68 72
69
70 private: 73 private:
71 enum Axis { AXIS_X, AXIS_Y }; 74 enum Axis { AXIS_X, AXIS_Y };
72 75
73 explicit OverscrollGlow(ui::SystemUIResourceManager* resource_manager);
74
75 // Returns whether the effect is initialized. 76 // Returns whether the effect is initialized.
76 bool InitializeIfNecessary(); 77 bool InitializeIfNecessary();
77 bool NeedsAnimate() const; 78 bool NeedsAnimate() const;
78 void UpdateLayerAttachment(cc::Layer* parent); 79 void UpdateLayerAttachment(cc::Layer* parent);
79 void Detach(); 80 void Detach();
80 void Pull(base::TimeTicks current_time, gfx::Vector2dF overscroll_delta); 81 void Pull(base::TimeTicks current_time,
82 const gfx::Vector2dF& overscroll_delta,
83 const gfx::Vector2dF& overscroll_location);
81 void Absorb(base::TimeTicks current_time, 84 void Absorb(base::TimeTicks current_time,
82 gfx::Vector2dF velocity, 85 const gfx::Vector2dF& velocity,
83 bool x_overscroll_started, 86 bool x_overscroll_started,
84 bool y_overscroll_started); 87 bool y_overscroll_started);
85 void Release(base::TimeTicks current_time); 88 void Release(base::TimeTicks current_time);
86 void ReleaseAxis(Axis axis, base::TimeTicks current_time);
87 89
88 EdgeEffect* GetOppositeEdge(int edge_index); 90 EdgeEffectBase* GetOppositeEdge(int edge_index);
89 91
90 scoped_ptr<EdgeEffect> edge_effects_[EdgeEffect::EDGE_COUNT]; 92 EdgeEffectProvider edge_effect_provider_;
93 scoped_ptr<EdgeEffectBase> edge_effects_[EDGE_COUNT];
91 94
92 DisplayParameters display_params_; 95 DisplayParameters display_params_;
93 bool enabled_; 96 bool enabled_;
94 bool initialized_; 97 bool initialized_;
95 98
96 scoped_refptr<cc::Layer> root_layer_; 99 scoped_refptr<cc::Layer> root_layer_;
97 ui::SystemUIResourceManager* resource_manager_;
98 100
99 DISALLOW_COPY_AND_ASSIGN(OverscrollGlow); 101 DISALLOW_COPY_AND_ASSIGN(OverscrollGlow);
100 }; 102 };
101 103
102 } // namespace content 104 } // namespace content
103 105
104 #endif // CONTENT_BROWSER_ANDROID_SCROLL_GLOW_H_ 106 #endif // CONTENT_BROWSER_ANDROID_SCROLL_GLOW_H_
OLDNEW
« no previous file with comments | « content/browser/android/edge_effect_l.cc ('k') | content/browser/android/overscroll_glow.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698