diff options
| author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-30 15:42:32 +0000 |
|---|---|---|
| committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-30 15:42:32 +0000 |
| commit | 65e4ca73666210d5553678bb885095128b77aaf2 (patch) | |
| tree | fce04ca2ba76581f0e4063aced1fd73d72c3d960 /content/browser/android/edge_effect.cc | |
| parent | 202ab0509d920010408513004bf5bb130f4fc535 (diff) | |
| download | chromium_src-65e4ca73666210d5553678bb885095128b77aaf2.zip chromium_src-65e4ca73666210d5553678bb885095128b77aaf2.tar.gz chromium_src-65e4ca73666210d5553678bb885095128b77aaf2.tar.bz2 | |
Use scaled_velocity in EdgeEffect::Absorb().
This fixes clang build of Chrome-On-Android.
BUG=265563
TEST="ninja -C out/Debug -j512 -l15 chrome_apk" works.
R=thakis@chromium.org, yfriedman@chromium.org
Review URL: https://codereview.chromium.org/21116003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214361 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/android/edge_effect.cc')
| -rw-r--r-- | content/browser/android/edge_effect.cc | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/content/browser/android/edge_effect.cc b/content/browser/android/edge_effect.cc index c7cd7d0..b46d3da 100644 --- a/content/browser/android/edge_effect.cc +++ b/content/browser/android/edge_effect.cc @@ -224,7 +224,8 @@ void EdgeEffect::Release(base::TimeTicks current_time) { void EdgeEffect::Absorb(base::TimeTicks current_time, float velocity) { state_ = STATE_ABSORB; - velocity = dpi_scale_ * std::max(kMinVelocity, std::abs(velocity)); + float scaled_velocity = + dpi_scale_ * std::max(kMinVelocity, std::abs(velocity)); start_time_ = current_time; // This should never be less than 1 millisecond. @@ -241,21 +242,21 @@ void EdgeEffect::Absorb(base::TimeTicks current_time, float velocity) { // Factor the velocity by 8. Testing on device shows this works best to // reflect the strength of the user's scrolling. - edge_alpha_finish_ = Clamp(velocity * kVelocityEdgeFactor, 0.f, 1.f); + edge_alpha_finish_ = Clamp(scaled_velocity * kVelocityEdgeFactor, 0.f, 1.f); // Edge should never get larger than the size of its asset. - edge_scale_y_finish_ = Clamp(velocity * kVelocityEdgeFactor, + edge_scale_y_finish_ = Clamp(scaled_velocity * kVelocityEdgeFactor, kHeldEdgeScaleY, 1.f); // Growth for the size of the glow should be quadratic to properly // respond // to a user's scrolling speed. The faster the scrolling speed, the more // intense the effect should be for both the size and the saturation. - glow_scale_y_finish_ = - std::min(0.025f + (velocity * (velocity / 100) * 0.00015f), 1.75f); + glow_scale_y_finish_ = std::min( + 0.025f + (scaled_velocity * (scaled_velocity / 100) * 0.00015f), 1.75f); // Alpha should change for the glow as well as size. - glow_alpha_finish_ = - Clamp(glow_alpha_start_, - velocity * kVelocityGlowFactor * .00001f, kMaxAlpha); + glow_alpha_finish_ = Clamp(glow_alpha_start_, + scaled_velocity * kVelocityGlowFactor * .00001f, + kMaxAlpha); } bool EdgeEffect::Update(base::TimeTicks current_time) { |