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

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

Issue 14268004: Add overscroll edge effect animations for Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanup and layer attachment fixes Created 7 years, 8 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
(Empty)
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
3 // found in the LICENSE file.
4
5 #include "content/browser/android/overscroll_glow.h"
6
7 #include "cc/layers/image_layer.h"
8 #include "skia/ext/image_operations.h"
9 #include "ui/gfx/android/java_bitmap.h"
10
11 namespace content {
12
13 namespace {
14
15 static SkBitmap CreateBitmap(const char* resource, gfx::Size size) {
16 SkBitmap bitmap = gfx::CreateSkBitmapFromResource(resource);
17 if (bitmap.isNull())
18 return bitmap;
19 return skia::ImageOperations::Resize(bitmap,
20 skia::ImageOperations::RESIZE_GOOD,
21 size.width(), size.height());
22 }
23
24 static const SkBitmap& GetOverscrollEdgeBitmap() {
25 static SkBitmap edge = CreateBitmap("android:drawable/overscroll_edge",
26 gfx::Size(256, 12));
27 return edge;
28 }
29
30 static const SkBitmap& GetOverscrollGlowBitmap() {
31 static SkBitmap glow = CreateBitmap("android:drawable/overscroll_glow",
32 gfx::Size(128, 128));
33 return glow;
34 }
35
36 static scoped_refptr<cc::Layer> NewLayer(const SkBitmap& bitmap) {
37 scoped_refptr<cc::ImageLayer> layer = cc::ImageLayer::Create();
38 layer->SetContentsOpaque(false);
39 layer->SetBitmap(bitmap);
40 return layer;
41 }
42
43 }
44
45 scoped_ptr<OverscrollGlow> OverscrollGlow::Create() {
46 const SkBitmap& edge = GetOverscrollEdgeBitmap();
47 const SkBitmap& glow = GetOverscrollGlowBitmap();
48 if (edge.isNull() || glow.isNull())
49 return scoped_ptr<OverscrollGlow>();
50
51 return make_scoped_ptr(new OverscrollGlow(edge, glow));
52 }
53
54 OverscrollGlow::OverscrollGlow(const SkBitmap& edge, const SkBitmap& glow)
55 : horizontal_overscroll_enabled_(true) {
56 for (unsigned i = 0; i < EDGE_COUNT; ++i) {
57 edge_effects_[i]
58 = make_scoped_ptr(new EdgeEffect(NewLayer(edge), NewLayer(glow)));
59 }
60 }
61
62 OverscrollGlow::~OverscrollGlow() { }
63
64 void OverscrollGlow::OnOverscrolled(base::TimeTicks current_time,
65 gfx::Vector2dF overscroll,
66 gfx::Vector2dF velocity) {
67 if (!horizontal_overscroll_enabled_) {
68 overscroll.set_x(0);
69 velocity.set_x(0);
70 }
71
72 if (overscroll.IsZero()) {
73 old_overscroll_ = overscroll;
74 if (IsAnimating())
75 Release(current_time);
76 return;
77 }
78
79 if (!velocity.IsZero()) {
80 Absorb(current_time, velocity, overscroll, old_overscroll_);
81 } else {
82 if (overscroll.x() * old_overscroll_.x() <= 0 ||
83 std::abs(overscroll.x()) < std::abs(old_overscroll_.x())) {
84 edge_effects_[EdgeEffect::EDGE_LEFT]->Release(current_time);
85 edge_effects_[EdgeEffect::EDGE_RIGHT]->Release(current_time);
86 }
87 if (overscroll.y() * old_overscroll_.y() <= 0 ||
88 std::abs(overscroll.y()) < std::abs(old_overscroll_.y())) {
89 edge_effects_[EdgeEffect::EDGE_TOP]->Release(current_time);
90 edge_effects_[EdgeEffect::EDGE_BOTTOM]->Release(current_time);
91 }
92
93 gfx::Vector2dF overscroll_delta = overscroll - old_overscroll_;
94 // Ensure monotonic overscroll accumulation
95 if (overscroll_delta.x() * old_overscroll_.x() < 0)
96 overscroll_delta.set_x(0);
97 if (overscroll_delta.y() * old_overscroll_.y() < 0)
98 overscroll_delta.set_y(0);
99 Pull(current_time, overscroll_delta);
100 }
101
102 old_overscroll_ = overscroll;
103 }
104
105 void OverscrollGlow::Release(base::TimeTicks current_time) {
106 for (unsigned i = 0; i < EDGE_COUNT; ++i) {
107 edge_effects_[i]->Release(current_time);
108 }
109 old_overscroll_ = gfx::Vector2dF();
110 }
111
112 void OverscrollGlow::Finish() {
113 for (unsigned i = 0; i < EDGE_COUNT; ++i) {
114 edge_effects_[i]->Finish();
115 }
116 old_overscroll_ = gfx::Vector2dF();
117 }
118
119 bool OverscrollGlow::Animate(base::TimeTicks current_time) {
120 if (size_.GetArea() == 0)
121 return IsAnimating();
122
123 const gfx::SizeF sizes[EDGE_COUNT] = {
124 size_, gfx::SizeF(size_.height(), size_.width()),
125 size_, gfx::SizeF(size_.height(), size_.width())
126 };
127
128 bool active = false;
129 for (unsigned i = 0; i < EDGE_COUNT; ++i) {
130 active |= edge_effects_[i]->Update(current_time);
131 edge_effects_[i]->Draw(parent_layer_, sizes[i],
132 static_cast<EdgeEffect::Edge>(i));
133 }
134
135 return active;
136 }
137
138 bool OverscrollGlow::IsAnimating() const {
139 for (unsigned i = 0; i < EDGE_COUNT; ++i) {
140 if (!edge_effects_[i]->IsFinished())
141 return false;
142 }
143 return true;
144 }
145
146 void OverscrollGlow::set_horizontal_overscroll_enabled(bool enabled) {
147 horizontal_overscroll_enabled_ = enabled;
148 }
149
150 void OverscrollGlow::set_size(const gfx::SizeF& size) {
151 size_ = size;
152 }
153
154 void OverscrollGlow::set_parent_layer(scoped_refptr<cc::Layer> parent_layer) {
155 if (parent_layer == parent_layer_)
156 return;
157
158 Finish();
159
160 parent_layer_ = parent_layer;
161 }
162
163
164 void OverscrollGlow::Pull(base::TimeTicks current_time,
165 const gfx::Vector2dF& overscroll_delta) {
166 using std::max;
167 using std::min;
168
169 if (overscroll_delta.IsZero())
170 return;
171
172 gfx::Vector2dF overscroll_pull = gfx::ScaleVector2d(overscroll_delta,
173 1.f / size_.width(),
174 1.f / size_.height());
175 float edge_overscroll_pull[EDGE_COUNT] = {
176 min(overscroll_pull.y(), 0.f), // Top
177 min(overscroll_pull.x(), 0.f), // Left
178 max(overscroll_pull.y(), 0.f), // Bottom
179 max(overscroll_pull.x(), 0.f) // Right
180 };
181
182 for (unsigned i = 0; i < EDGE_COUNT; ++i) {
183 if (!edge_overscroll_pull[i])
184 continue;
185
186 EdgeEffect& edge_effect = *edge_effects_[i];
187 EdgeEffect& opposite_edge_effect = *GetOppositeEdge(i);
188 edge_effect.Pull(current_time, std::abs(edge_overscroll_pull[i]));
189 if (!opposite_edge_effect.IsFinished())
190 opposite_edge_effect.Release(current_time);
191 }
192 }
193
194 void OverscrollGlow::Absorb(base::TimeTicks current_time,
195 const gfx::Vector2dF& velocity,
196 const gfx::Vector2dF& overscroll,
197 const gfx::Vector2dF& old_overscroll) {
198 using std::max;
199 using std::min;
200
201 if (overscroll.IsZero() || velocity.IsZero())
202 return;
203
204 // Only trigger on initial overscroll at a non-zero velocity
205 const float overscroll_velocities[EDGE_COUNT] = {
206 old_overscroll.y() >= 0 && overscroll.y() < 0 ? min(velocity.y(), 0.f) : 0,
207 old_overscroll.x() >= 0 && overscroll.x() < 0 ? min(velocity.x(), 0.f) : 0,
208 old_overscroll.y() <= 0 && overscroll.y() > 0 ? max(velocity.y(), 0.f) : 0,
209 old_overscroll.x() <= 0 && overscroll.x() > 0 ? max(velocity.x(), 0.f) : 0
210 };
211
212 for (unsigned i = 0; i < EDGE_COUNT; ++i) {
213 if (!overscroll_velocities[i])
214 continue;
215
216 EdgeEffect& edge_effect = *edge_effects_[i];
217 EdgeEffect& opposite_edge_effect = *GetOppositeEdge(i);
218 edge_effect.Absorb(current_time, std::abs(overscroll_velocities[i]));
219 if (!opposite_edge_effect.IsFinished()) {
220 opposite_edge_effect.Release(current_time);
221 }
222 }
223 }
224
225 EdgeEffect* OverscrollGlow::GetOppositeEdge(int edge_index) {
226 return edge_effects_[(edge_index + 2) % EDGE_COUNT].get();
227 }
228
229
230
231 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698