| OLD | NEW |
| 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 #include "content/browser/android/overscroll_glow.h" | 5 #include "content/browser/android/overscroll_glow.h" |
| 6 | 6 |
| 7 #include "base/debug/trace_event.h" | 7 #include "base/android/build_info.h" |
| 8 #include "base/lazy_instance.h" | 8 #include "base/bind.h" |
| 9 #include "base/location.h" |
| 10 #include "base/logging.h" |
| 9 #include "base/threading/worker_pool.h" | 11 #include "base/threading/worker_pool.h" |
| 10 #include "cc/layers/image_layer.h" | 12 #include "cc/layers/layer.h" |
| 11 #include "content/browser/android/edge_effect.h" | 13 #include "content/browser/android/edge_effect.h" |
| 12 #include "skia/ext/image_operations.h" | 14 #include "content/browser/android/edge_effect_l.h" |
| 13 #include "ui/gfx/android/java_bitmap.h" | 15 #include "ui/gfx/screen.h" |
| 14 | 16 |
| 15 using std::max; | 17 using std::max; |
| 16 using std::min; | 18 using std::min; |
| 17 | 19 |
| 18 namespace content { | 20 namespace content { |
| 19 | 21 |
| 20 namespace { | 22 namespace { |
| 21 | 23 |
| 22 const float kEpsilon = 1e-3f; | 24 const float kEpsilon = 1e-3f; |
| 23 const int kScaledEdgeHeight = 12; | |
| 24 const int kScaledGlowHeight = 64; | |
| 25 const float kEdgeHeightAtMdpi = 12.f; | |
| 26 const float kGlowHeightAtMdpi = 128.f; | |
| 27 | 25 |
| 28 SkBitmap CreateSkBitmapFromAndroidResource(const char* name, gfx::Size size) { | 26 // The maximum Android build version prior to L release. |
| 29 base::android::ScopedJavaLocalRef<jobject> jobj = | 27 const int kKitKatSDKVersion = 19; |
| 30 gfx::CreateJavaBitmapFromAndroidResource(name, size); | |
| 31 if (jobj.is_null()) | |
| 32 return SkBitmap(); | |
| 33 | |
| 34 SkBitmap bitmap = CreateSkBitmapFromJavaBitmap(gfx::JavaBitmap(jobj.obj())); | |
| 35 if (bitmap.isNull()) | |
| 36 return bitmap; | |
| 37 | |
| 38 return skia::ImageOperations::Resize( | |
| 39 bitmap, skia::ImageOperations::RESIZE_BOX, size.width(), size.height()); | |
| 40 } | |
| 41 | |
| 42 class OverscrollResources { | |
| 43 public: | |
| 44 OverscrollResources() { | |
| 45 TRACE_EVENT0("browser", "OverscrollResources::Create"); | |
| 46 edge_bitmap_ = | |
| 47 CreateSkBitmapFromAndroidResource("android:drawable/overscroll_edge", | |
| 48 gfx::Size(128, kScaledEdgeHeight)); | |
| 49 glow_bitmap_ = | |
| 50 CreateSkBitmapFromAndroidResource("android:drawable/overscroll_glow", | |
| 51 gfx::Size(128, kScaledGlowHeight)); | |
| 52 } | |
| 53 | |
| 54 const SkBitmap& edge_bitmap() const { return edge_bitmap_; } | |
| 55 const SkBitmap& glow_bitmap() const { return glow_bitmap_; } | |
| 56 | |
| 57 private: | |
| 58 SkBitmap edge_bitmap_; | |
| 59 SkBitmap glow_bitmap_; | |
| 60 | |
| 61 DISALLOW_COPY_AND_ASSIGN(OverscrollResources); | |
| 62 }; | |
| 63 | |
| 64 // Leaky to allow access from a worker thread. | |
| 65 base::LazyInstance<OverscrollResources>::Leaky g_overscroll_resources = | |
| 66 LAZY_INSTANCE_INITIALIZER; | |
| 67 | |
| 68 scoped_refptr<cc::Layer> CreateImageLayer(const SkBitmap& bitmap) { | |
| 69 scoped_refptr<cc::ImageLayer> layer = cc::ImageLayer::Create(); | |
| 70 layer->SetBitmap(bitmap); | |
| 71 return layer; | |
| 72 } | |
| 73 | 28 |
| 74 bool IsApproxZero(float value) { | 29 bool IsApproxZero(float value) { |
| 75 return std::abs(value) < kEpsilon; | 30 return std::abs(value) < kEpsilon; |
| 76 } | 31 } |
| 77 | 32 |
| 78 gfx::Vector2dF ZeroSmallComponents(gfx::Vector2dF vector) { | 33 gfx::Vector2dF ZeroSmallComponents(gfx::Vector2dF vector) { |
| 79 if (IsApproxZero(vector.x())) | 34 if (IsApproxZero(vector.x())) |
| 80 vector.set_x(0); | 35 vector.set_x(0); |
| 81 if (IsApproxZero(vector.y())) | 36 if (IsApproxZero(vector.y())) |
| 82 vector.set_y(0); | 37 vector.set_y(0); |
| 83 return vector; | 38 return vector; |
| 84 } | 39 } |
| 85 | 40 |
| 86 // Force loading of any necessary resources. This function is thread-safe. | 41 gfx::Transform ComputeTransform(OverscrollGlow::Edge edge, |
| 87 void EnsureResources() { | 42 const gfx::SizeF& window_size, |
| 88 g_overscroll_resources.Get(); | 43 float offset) { |
| 44 // Transforms assume the edge layers are anchored to their *top center point*. |
| 45 switch (edge) { |
| 46 case OverscrollGlow::EDGE_TOP: |
| 47 return gfx::Transform(1, 0, 0, 1, 0, offset); |
| 48 case OverscrollGlow::EDGE_LEFT: |
| 49 return gfx::Transform(0, 1, -1, 0, |
| 50 -window_size.height() / 2.f + offset, |
| 51 window_size.height() / 2.f); |
| 52 case OverscrollGlow::EDGE_BOTTOM: |
| 53 return gfx::Transform(-1, 0, 0, -1, 0, window_size.height() + offset); |
| 54 case OverscrollGlow::EDGE_RIGHT: |
| 55 return gfx::Transform(0, -1, 1, 0, |
| 56 -window_size.height() / 2.f + window_size.width() + offset, |
| 57 window_size.height() / 2.f); |
| 58 default: |
| 59 NOTREACHED() << "Invalid edge: " << edge; |
| 60 return gfx::Transform(); |
| 61 }; |
| 62 } |
| 63 |
| 64 gfx::SizeF ComputeSize(OverscrollGlow::Edge edge, |
| 65 const gfx::SizeF& window_size) { |
| 66 switch (edge) { |
| 67 case OverscrollGlow::EDGE_TOP: |
| 68 case OverscrollGlow::EDGE_BOTTOM: |
| 69 return window_size; |
| 70 case OverscrollGlow::EDGE_LEFT: |
| 71 case OverscrollGlow::EDGE_RIGHT: |
| 72 return gfx::SizeF(window_size.height(), window_size.width()); |
| 73 default: |
| 74 NOTREACHED() << "Invalid edge: " << edge; |
| 75 return gfx::SizeF(); |
| 76 }; |
| 77 } |
| 78 |
| 79 bool UseEdgeEffectL() { |
| 80 static bool use_edge_effect_l = |
| 81 base::android::BuildInfo::GetInstance()->sdk_int() > kKitKatSDKVersion; |
| 82 return use_edge_effect_l; |
| 83 } |
| 84 |
| 85 void EnsureResourcesNonBlocking() { |
| 86 static bool s_resources_loaded = false; |
| 87 |
| 88 if (s_resources_loaded) |
| 89 return; |
| 90 |
| 91 // Don't block the main thread with effect resource loading during creation. |
| 92 // Effect instantiation is deferred until the effect overscrolls, in which |
| 93 // case the main thread may block until the resource has loaded. |
| 94 s_resources_loaded = true; |
| 95 if (UseEdgeEffectL()) { |
| 96 base::WorkerPool::PostTask( |
| 97 FROM_HERE, base::Bind(EdgeEffectL::EnsureResources), true); |
| 98 } else { |
| 99 base::WorkerPool::PostTask( |
| 100 FROM_HERE, base::Bind(EdgeEffect::EnsureResources), true); |
| 101 } |
| 102 } |
| 103 |
| 104 scoped_ptr<EdgeEffectBase> CreateEdgeEffect(cc::Layer* root_layer, |
| 105 float device_scale_factor) { |
| 106 scoped_ptr<EdgeEffectBase> result; |
| 107 if (UseEdgeEffectL()) |
| 108 result = EdgeEffectL::Create(root_layer); |
| 109 else |
| 110 result = EdgeEffect::Create(root_layer, device_scale_factor); |
| 111 return result.Pass(); |
| 89 } | 112 } |
| 90 | 113 |
| 91 } // namespace | 114 } // namespace |
| 92 | 115 |
| 93 scoped_ptr<OverscrollGlow> OverscrollGlow::Create(bool enabled) { | 116 scoped_ptr<OverscrollGlow> OverscrollGlow::Create(bool enabled) { |
| 94 // Don't block the main thread with effect resource loading during creation. | 117 if (enabled) |
| 95 // Effect instantiation is deferred until the effect overscrolls, in which | 118 EnsureResourcesNonBlocking(); |
| 96 // case the main thread may block until the resource has loaded. | |
| 97 if (enabled && g_overscroll_resources == NULL) | |
| 98 base::WorkerPool::PostTask(FROM_HERE, base::Bind(EnsureResources), true); | |
| 99 | |
| 100 return make_scoped_ptr(new OverscrollGlow(enabled)); | 119 return make_scoped_ptr(new OverscrollGlow(enabled)); |
| 101 } | 120 } |
| 102 | 121 |
| 103 OverscrollGlow::OverscrollGlow(bool enabled) | 122 OverscrollGlow::OverscrollGlow(bool enabled) |
| 104 : enabled_(enabled), initialized_(false) {} | 123 : enabled_(enabled), initialized_(false) {} |
| 105 | 124 |
| 106 OverscrollGlow::~OverscrollGlow() { | 125 OverscrollGlow::~OverscrollGlow() { |
| 107 Detach(); | 126 Detach(); |
| 108 } | 127 } |
| 109 | 128 |
| 110 void OverscrollGlow::Enable() { | 129 void OverscrollGlow::Enable() { |
| 111 enabled_ = true; | 130 enabled_ = true; |
| 112 } | 131 } |
| 113 | 132 |
| 114 void OverscrollGlow::Disable() { | 133 void OverscrollGlow::Disable() { |
| 115 if (!enabled_) | 134 if (!enabled_) |
| 116 return; | 135 return; |
| 117 enabled_ = false; | 136 enabled_ = false; |
| 118 if (!enabled_ && initialized_) { | 137 if (!enabled_ && initialized_) { |
| 119 Detach(); | 138 Detach(); |
| 120 for (size_t i = 0; i < EdgeEffect::EDGE_COUNT; ++i) | 139 for (size_t i = 0; i < EDGE_COUNT; ++i) |
| 121 edge_effects_[i]->Finish(); | 140 edge_effects_[i]->Finish(); |
| 122 } | 141 } |
| 123 } | 142 } |
| 124 | 143 |
| 125 bool OverscrollGlow::OnOverscrolled(cc::Layer* overscrolling_layer, | 144 bool OverscrollGlow::OnOverscrolled(cc::Layer* overscrolling_layer, |
| 126 base::TimeTicks current_time, | 145 base::TimeTicks current_time, |
| 127 gfx::Vector2dF accumulated_overscroll, | 146 gfx::Vector2dF accumulated_overscroll, |
| 128 gfx::Vector2dF overscroll_delta, | 147 gfx::Vector2dF overscroll_delta, |
| 129 gfx::Vector2dF velocity) { | 148 gfx::Vector2dF velocity, |
| 149 gfx::Vector2dF displacement) { |
| 130 DCHECK(overscrolling_layer); | 150 DCHECK(overscrolling_layer); |
| 131 | 151 |
| 132 if (!enabled_) | 152 if (!enabled_) |
| 133 return false; | 153 return false; |
| 134 | 154 |
| 135 // The size of the glow determines the relative effect of the inputs; an | 155 // The size of the glow determines the relative effect of the inputs; an |
| 136 // empty-sized effect is effectively disabled. | 156 // empty-sized effect is effectively disabled. |
| 137 if (display_params_.size.IsEmpty()) | 157 if (display_params_.size.IsEmpty()) |
| 138 return false; | 158 return false; |
| 139 | 159 |
| (...skipping 18 matching lines...) Expand all Loading... |
| 158 | 178 |
| 159 if (x_overscroll_started) | 179 if (x_overscroll_started) |
| 160 ReleaseAxis(AXIS_X, current_time); | 180 ReleaseAxis(AXIS_X, current_time); |
| 161 if (y_overscroll_started) | 181 if (y_overscroll_started) |
| 162 ReleaseAxis(AXIS_Y, current_time); | 182 ReleaseAxis(AXIS_Y, current_time); |
| 163 | 183 |
| 164 velocity = ZeroSmallComponents(velocity); | 184 velocity = ZeroSmallComponents(velocity); |
| 165 if (!velocity.IsZero()) | 185 if (!velocity.IsZero()) |
| 166 Absorb(current_time, velocity, x_overscroll_started, y_overscroll_started); | 186 Absorb(current_time, velocity, x_overscroll_started, y_overscroll_started); |
| 167 else | 187 else |
| 168 Pull(current_time, overscroll_delta); | 188 Pull(current_time, overscroll_delta, displacement); |
| 169 | 189 |
| 170 UpdateLayerAttachment(overscrolling_layer); | 190 UpdateLayerAttachment(overscrolling_layer); |
| 171 return NeedsAnimate(); | 191 return NeedsAnimate(); |
| 172 } | 192 } |
| 173 | 193 |
| 174 bool OverscrollGlow::Animate(base::TimeTicks current_time) { | 194 bool OverscrollGlow::Animate(base::TimeTicks current_time) { |
| 175 if (!NeedsAnimate()) { | 195 if (!NeedsAnimate()) { |
| 176 Detach(); | 196 Detach(); |
| 177 return false; | 197 return false; |
| 178 } | 198 } |
| 179 | 199 |
| 180 for (size_t i = 0; i < EdgeEffect::EDGE_COUNT; ++i) { | 200 for (size_t i = 0; i < EDGE_COUNT; ++i) { |
| 181 if (edge_effects_[i]->Update(current_time)) { | 201 if (edge_effects_[i]->Update(current_time)) { |
| 202 Edge edge = static_cast<Edge>(i); |
| 182 edge_effects_[i]->ApplyToLayers( | 203 edge_effects_[i]->ApplyToLayers( |
| 183 display_params_.size, | 204 ComputeSize(edge, display_params_.size), |
| 184 static_cast<EdgeEffect::Edge>(i), | 205 ComputeTransform( |
| 185 kEdgeHeightAtMdpi * display_params_.device_scale_factor, | 206 edge, display_params_.size, display_params_.edge_offsets[i])); |
| 186 kGlowHeightAtMdpi * display_params_.device_scale_factor, | |
| 187 display_params_.edge_offsets[i]); | |
| 188 } | 207 } |
| 189 } | 208 } |
| 190 | 209 |
| 191 if (!NeedsAnimate()) { | 210 if (!NeedsAnimate()) { |
| 192 Detach(); | 211 Detach(); |
| 193 return false; | 212 return false; |
| 194 } | 213 } |
| 195 | 214 |
| 196 return true; | 215 return true; |
| 197 } | 216 } |
| 198 | 217 |
| 199 void OverscrollGlow::UpdateDisplayParameters(const DisplayParameters& params) { | 218 void OverscrollGlow::UpdateDisplayParameters(const DisplayParameters& params) { |
| 200 display_params_ = params; | 219 display_params_ = params; |
| 201 } | 220 } |
| 202 | 221 |
| 203 bool OverscrollGlow::NeedsAnimate() const { | 222 bool OverscrollGlow::NeedsAnimate() const { |
| 204 if (!enabled_ || !initialized_) | 223 if (!enabled_ || !initialized_) |
| 205 return false; | 224 return false; |
| 206 for (size_t i = 0; i < EdgeEffect::EDGE_COUNT; ++i) { | 225 for (size_t i = 0; i < EDGE_COUNT; ++i) { |
| 207 if (!edge_effects_[i]->IsFinished()) | 226 if (!edge_effects_[i]->IsFinished()) |
| 208 return true; | 227 return true; |
| 209 } | 228 } |
| 210 return false; | 229 return false; |
| 211 } | 230 } |
| 212 | 231 |
| 213 void OverscrollGlow::UpdateLayerAttachment(cc::Layer* parent) { | 232 void OverscrollGlow::UpdateLayerAttachment(cc::Layer* parent) { |
| 214 DCHECK(parent); | 233 DCHECK(parent); |
| 215 if (!root_layer_) | 234 if (!root_layer_) |
| 216 return; | 235 return; |
| (...skipping 10 matching lines...) Expand all Loading... |
| 227 void OverscrollGlow::Detach() { | 246 void OverscrollGlow::Detach() { |
| 228 if (root_layer_) | 247 if (root_layer_) |
| 229 root_layer_->RemoveFromParent(); | 248 root_layer_->RemoveFromParent(); |
| 230 } | 249 } |
| 231 | 250 |
| 232 bool OverscrollGlow::InitializeIfNecessary() { | 251 bool OverscrollGlow::InitializeIfNecessary() { |
| 233 DCHECK(enabled_); | 252 DCHECK(enabled_); |
| 234 if (initialized_) | 253 if (initialized_) |
| 235 return true; | 254 return true; |
| 236 | 255 |
| 237 const SkBitmap& edge = g_overscroll_resources.Get().edge_bitmap(); | 256 DCHECK(!root_layer_); |
| 238 const SkBitmap& glow = g_overscroll_resources.Get().glow_bitmap(); | 257 scoped_refptr<cc::Layer> root_layer = cc::Layer::Create(); |
| 239 if (edge.isNull() || glow.isNull()) { | 258 const float device_scale_factor = |
| 240 Disable(); | 259 gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().device_scale_factor(); |
| 241 return false; | 260 for (size_t i = 0; i < EDGE_COUNT; ++i) { |
| 261 edge_effects_[i] = CreateEdgeEffect(root_layer.get(), device_scale_factor); |
| 262 if (!edge_effects_[i]) |
| 263 Disable(); |
| 242 } | 264 } |
| 243 | 265 root_layer_ = root_layer; |
| 244 DCHECK(!root_layer_); | |
| 245 root_layer_ = cc::Layer::Create(); | |
| 246 for (size_t i = 0; i < EdgeEffect::EDGE_COUNT; ++i) { | |
| 247 scoped_refptr<cc::Layer> edge_layer = CreateImageLayer(edge); | |
| 248 scoped_refptr<cc::Layer> glow_layer = CreateImageLayer(glow); | |
| 249 root_layer_->AddChild(edge_layer); | |
| 250 root_layer_->AddChild(glow_layer); | |
| 251 edge_effects_[i] = make_scoped_ptr(new EdgeEffect(edge_layer, glow_layer)); | |
| 252 } | |
| 253 | 266 |
| 254 initialized_ = true; | 267 initialized_ = true; |
| 255 return true; | 268 return true; |
| 256 } | 269 } |
| 257 | 270 |
| 258 void OverscrollGlow::Pull(base::TimeTicks current_time, | 271 void OverscrollGlow::Pull(base::TimeTicks current_time, |
| 259 gfx::Vector2dF overscroll_delta) { | 272 const gfx::Vector2dF& overscroll_delta, |
| 273 const gfx::Vector2dF& overscroll_location) { |
| 260 DCHECK(enabled_ && initialized_); | 274 DCHECK(enabled_ && initialized_); |
| 261 overscroll_delta = ZeroSmallComponents(overscroll_delta); | 275 DCHECK(!overscroll_delta.IsZero()); |
| 262 if (overscroll_delta.IsZero()) | 276 const float inv_width = 1.f / display_params_.size.width(); |
| 263 return; | 277 const float inv_height = 1.f / display_params_.size.height(); |
| 264 | 278 |
| 265 gfx::Vector2dF overscroll_pull = | 279 gfx::Vector2dF overscroll_pull = |
| 266 gfx::ScaleVector2d(overscroll_delta, | 280 gfx::ScaleVector2d(overscroll_delta, inv_width, inv_height); |
| 267 1.f / display_params_.size.width(), | 281 const float edge_pull[EDGE_COUNT] = { |
| 268 1.f / display_params_.size.height()); | |
| 269 float edge_overscroll_pull[EdgeEffect::EDGE_COUNT] = { | |
| 270 min(overscroll_pull.y(), 0.f), // Top | 282 min(overscroll_pull.y(), 0.f), // Top |
| 271 min(overscroll_pull.x(), 0.f), // Left | 283 min(overscroll_pull.x(), 0.f), // Left |
| 272 max(overscroll_pull.y(), 0.f), // Bottom | 284 max(overscroll_pull.y(), 0.f), // Bottom |
| 273 max(overscroll_pull.x(), 0.f) // Right | 285 max(overscroll_pull.x(), 0.f) // Right |
| 274 }; | 286 }; |
| 275 | 287 |
| 276 for (size_t i = 0; i < EdgeEffect::EDGE_COUNT; ++i) { | 288 gfx::Vector2dF displacement = |
| 277 if (!edge_overscroll_pull[i]) | 289 gfx::ScaleVector2d(overscroll_location, inv_width, inv_height); |
| 290 displacement.set_x(max(0.f, min(1.f, displacement.x()))); |
| 291 displacement.set_y(max(0.f, min(1.f, displacement.y()))); |
| 292 const float edge_displacement[EDGE_COUNT] = { |
| 293 1.f - displacement.x(), // Top |
| 294 displacement.y(), // Left |
| 295 displacement.x(), // Bottom |
| 296 1.f - displacement.y() // Right |
| 297 }; |
| 298 |
| 299 for (size_t i = 0; i < EDGE_COUNT; ++i) { |
| 300 if (!edge_pull[i]) |
| 278 continue; | 301 continue; |
| 279 | 302 |
| 280 edge_effects_[i]->Pull(current_time, std::abs(edge_overscroll_pull[i])); | 303 edge_effects_[i]->Pull( |
| 304 current_time, std::abs(edge_pull[i]), edge_displacement[i]); |
| 281 GetOppositeEdge(i)->Release(current_time); | 305 GetOppositeEdge(i)->Release(current_time); |
| 282 } | 306 } |
| 283 } | 307 } |
| 284 | 308 |
| 285 void OverscrollGlow::Absorb(base::TimeTicks current_time, | 309 void OverscrollGlow::Absorb(base::TimeTicks current_time, |
| 286 gfx::Vector2dF velocity, | 310 const gfx::Vector2dF& velocity, |
| 287 bool x_overscroll_started, | 311 bool x_overscroll_started, |
| 288 bool y_overscroll_started) { | 312 bool y_overscroll_started) { |
| 289 DCHECK(enabled_ && initialized_); | 313 DCHECK(enabled_ && initialized_); |
| 290 if (velocity.IsZero()) | 314 DCHECK(!velocity.IsZero()); |
| 291 return; | |
| 292 | 315 |
| 293 // Only trigger on initial overscroll at a non-zero velocity | 316 // Only trigger on initial overscroll at a non-zero velocity |
| 294 const float overscroll_velocities[EdgeEffect::EDGE_COUNT] = { | 317 const float overscroll_velocities[EDGE_COUNT] = { |
| 295 y_overscroll_started ? min(velocity.y(), 0.f) : 0, // Top | 318 y_overscroll_started ? min(velocity.y(), 0.f) : 0, // Top |
| 296 x_overscroll_started ? min(velocity.x(), 0.f) : 0, // Left | 319 x_overscroll_started ? min(velocity.x(), 0.f) : 0, // Left |
| 297 y_overscroll_started ? max(velocity.y(), 0.f) : 0, // Bottom | 320 y_overscroll_started ? max(velocity.y(), 0.f) : 0, // Bottom |
| 298 x_overscroll_started ? max(velocity.x(), 0.f) : 0 // Right | 321 x_overscroll_started ? max(velocity.x(), 0.f) : 0 // Right |
| 299 }; | 322 }; |
| 300 | 323 |
| 301 for (size_t i = 0; i < EdgeEffect::EDGE_COUNT; ++i) { | 324 for (size_t i = 0; i < EDGE_COUNT; ++i) { |
| 302 if (!overscroll_velocities[i]) | 325 if (!overscroll_velocities[i]) |
| 303 continue; | 326 continue; |
| 304 | 327 |
| 305 edge_effects_[i]->Absorb(current_time, std::abs(overscroll_velocities[i])); | 328 edge_effects_[i]->Absorb(current_time, std::abs(overscroll_velocities[i])); |
| 306 GetOppositeEdge(i)->Release(current_time); | 329 GetOppositeEdge(i)->Release(current_time); |
| 307 } | 330 } |
| 308 } | 331 } |
| 309 | 332 |
| 310 void OverscrollGlow::Release(base::TimeTicks current_time) { | 333 void OverscrollGlow::Release(base::TimeTicks current_time) { |
| 311 DCHECK(initialized_); | 334 DCHECK(initialized_); |
| 312 for (size_t i = 0; i < EdgeEffect::EDGE_COUNT; ++i) | 335 for (size_t i = 0; i < EDGE_COUNT; ++i) |
| 313 edge_effects_[i]->Release(current_time); | 336 edge_effects_[i]->Release(current_time); |
| 314 } | 337 } |
| 315 | 338 |
| 316 void OverscrollGlow::ReleaseAxis(Axis axis, base::TimeTicks current_time) { | 339 void OverscrollGlow::ReleaseAxis(Axis axis, base::TimeTicks current_time) { |
| 317 DCHECK(initialized_); | 340 DCHECK(initialized_); |
| 318 switch (axis) { | 341 switch (axis) { |
| 319 case AXIS_X: | 342 case AXIS_X: |
| 320 edge_effects_[EdgeEffect::EDGE_LEFT]->Release(current_time); | 343 edge_effects_[EDGE_LEFT]->Release(current_time); |
| 321 edge_effects_[EdgeEffect::EDGE_RIGHT]->Release(current_time); | 344 edge_effects_[EDGE_RIGHT]->Release(current_time); |
| 322 break; | 345 break; |
| 323 case AXIS_Y: | 346 case AXIS_Y: |
| 324 edge_effects_[EdgeEffect::EDGE_TOP]->Release(current_time); | 347 edge_effects_[EDGE_TOP]->Release(current_time); |
| 325 edge_effects_[EdgeEffect::EDGE_BOTTOM]->Release(current_time); | 348 edge_effects_[EDGE_BOTTOM]->Release(current_time); |
| 326 break; | 349 break; |
| 327 }; | 350 }; |
| 328 } | 351 } |
| 329 | 352 |
| 330 EdgeEffect* OverscrollGlow::GetOppositeEdge(int edge_index) { | 353 EdgeEffectBase* OverscrollGlow::GetOppositeEdge(int edge_index) { |
| 331 DCHECK(initialized_); | 354 DCHECK(initialized_); |
| 332 return edge_effects_[(edge_index + 2) % EdgeEffect::EDGE_COUNT].get(); | 355 return edge_effects_[(edge_index + 2) % EDGE_COUNT].get(); |
| 333 } | 356 } |
| 334 | 357 |
| 335 OverscrollGlow::DisplayParameters::DisplayParameters() | 358 OverscrollGlow::DisplayParameters::DisplayParameters() { |
| 336 : device_scale_factor(1) { | |
| 337 edge_offsets[0] = edge_offsets[1] = edge_offsets[2] = edge_offsets[3] = 0.f; | 359 edge_offsets[0] = edge_offsets[1] = edge_offsets[2] = edge_offsets[3] = 0.f; |
| 338 } | 360 } |
| 339 | 361 |
| 340 } // namespace content | 362 } // namespace content |
| OLD | NEW |