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

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

Issue 422013003: [Android] Use UIResource for overscroll glow (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove unnecessary layer disabling code 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 | « no previous file | content/browser/android/edge_effect.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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 CONTENT_BROWSER_ANDROID_EDGE_EFFECT_H_ 5 #ifndef CONTENT_BROWSER_ANDROID_EDGE_EFFECT_H_
6 #define CONTENT_BROWSER_ANDROID_EDGE_EFFECT_H_ 6 #define CONTENT_BROWSER_ANDROID_EDGE_EFFECT_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/time/time.h" 10 #include "base/time/time.h"
11 #include "ui/gfx/size_f.h" 11 #include "ui/gfx/size_f.h"
12 12
13 namespace cc { 13 namespace cc {
14 class Layer; 14 class Layer;
15 } 15 }
16 16
17 namespace ui {
18 class SystemUIResourceManager;
19 }
20
17 namespace content { 21 namespace content {
18 22
19 /* |EdgeEffect| mirrors its Android counterpart, EdgeEffect.java. 23 /* |EdgeEffect| mirrors its Android counterpart, EdgeEffect.java.
20 * The primary difference is ownership; the Android version manages render 24 * The primary difference is ownership; the Android version manages render
21 * resources directly, while this version simply applies the effect to 25 * resources directly, while this version simply applies the effect to
22 * existing resources. Conscious tradeoffs were made to align this as closely 26 * existing resources. Conscious tradeoffs were made to align this as closely
23 * as possible with the original Android java version. 27 * as possible with the original Android java version.
24 * All coordinates and dimensions are in device pixels. 28 * All coordinates and dimensions are in device pixels.
25 */ 29 */
26 class EdgeEffect { 30 class EdgeEffect {
27 public: 31 public:
28 enum Edge { 32 enum Edge {
29 EDGE_TOP = 0, 33 EDGE_TOP = 0,
30 EDGE_LEFT, 34 EDGE_LEFT,
31 EDGE_BOTTOM, 35 EDGE_BOTTOM,
32 EDGE_RIGHT, 36 EDGE_RIGHT,
33 EDGE_COUNT 37 EDGE_COUNT
34 }; 38 };
35 39
36 EdgeEffect(scoped_refptr<cc::Layer> edge, scoped_refptr<cc::Layer> glow); 40 explicit EdgeEffect(ui::SystemUIResourceManager* resource_manager);
37 ~EdgeEffect(); 41 ~EdgeEffect();
38 42
39 void Pull(base::TimeTicks current_time, float delta_distance); 43 void Pull(base::TimeTicks current_time, float delta_distance);
40 void Absorb(base::TimeTicks current_time, float velocity); 44 void Absorb(base::TimeTicks current_time, float velocity);
41 bool Update(base::TimeTicks current_time); 45 bool Update(base::TimeTicks current_time);
42 void Release(base::TimeTicks current_time); 46 void Release(base::TimeTicks current_time);
43 47
44 void Finish(); 48 void Finish();
45 bool IsFinished() const; 49 bool IsFinished() const;
46 50
47 void ApplyToLayers(gfx::SizeF window_size, 51 void ApplyToLayers(gfx::SizeF window_size,
48 Edge edge, 52 Edge edge,
49 float edge_height, 53 float edge_height,
50 float glow_height, 54 float glow_height,
51 float offset); 55 float offset);
52 56
53 private: 57 void SetParent(cc::Layer* parent);
54 58
59 static void PreloadResources(ui::SystemUIResourceManager* resource_manager);
60
61 private:
55 enum State { 62 enum State {
56 STATE_IDLE = 0, 63 STATE_IDLE = 0,
57 STATE_PULL, 64 STATE_PULL,
58 STATE_ABSORB, 65 STATE_ABSORB,
59 STATE_RECEDE, 66 STATE_RECEDE,
60 STATE_PULL_DECAY 67 STATE_PULL_DECAY
61 }; 68 };
62 69
63 scoped_refptr<cc::Layer> edge_; 70 class EffectLayer;
64 scoped_refptr<cc::Layer> glow_; 71 scoped_ptr<EffectLayer> edge_;
72 scoped_ptr<EffectLayer> glow_;
65 73
66 float edge_alpha_; 74 float edge_alpha_;
67 float edge_scale_y_; 75 float edge_scale_y_;
68 float glow_alpha_; 76 float glow_alpha_;
69 float glow_scale_y_; 77 float glow_scale_y_;
70 78
71 float edge_alpha_start_; 79 float edge_alpha_start_;
72 float edge_alpha_finish_; 80 float edge_alpha_finish_;
73 float edge_scale_y_start_; 81 float edge_scale_y_start_;
74 float edge_scale_y_finish_; 82 float edge_scale_y_finish_;
75 float glow_alpha_start_; 83 float glow_alpha_start_;
76 float glow_alpha_finish_; 84 float glow_alpha_finish_;
77 float glow_scale_y_start_; 85 float glow_scale_y_start_;
78 float glow_scale_y_finish_; 86 float glow_scale_y_finish_;
79 87
80 base::TimeTicks start_time_; 88 base::TimeTicks start_time_;
81 base::TimeDelta duration_; 89 base::TimeDelta duration_;
82 90
83 State state_; 91 State state_;
84 92
85 float pull_distance_; 93 float pull_distance_;
86 94
87 DISALLOW_COPY_AND_ASSIGN(EdgeEffect); 95 DISALLOW_COPY_AND_ASSIGN(EdgeEffect);
88 }; 96 };
89 97
90 } // namespace content 98 } // namespace content
91 99
92 #endif // CONTENT_BROWSER_ANDROID_EDGE_EFFECT_H_ 100 #endif // CONTENT_BROWSER_ANDROID_EDGE_EFFECT_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/android/edge_effect.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698