Skip to content
This repository has been archived by the owner on Aug 4, 2022. It is now read-only.

Commit

Permalink
Backed out changeset e64cbe967b63 (bug 1480866) for GTest failure. CL…
Browse files Browse the repository at this point in the history
…OSED TREE
  • Loading branch information
nbeleuzu committed Aug 7, 2018
1 parent cadfe86 commit 5655897
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 11 deletions.
2 changes: 0 additions & 2 deletions gfx/layers/apz/src/AndroidFlingPhysics.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,6 @@ void AndroidFlingPhysics::Init(const ParentLayerPoint& aStartingVelocity,
float aPLPPI)
{
mVelocity = aStartingVelocity.Length();
// We should not have created a fling animation if there is no velocity.
MOZ_ASSERT(mVelocity != 0.0f);
const double tuningCoeff = ComputeDeceleration(aPLPPI);
mTargetDuration = ComputeFlingDuration(mVelocity, tuningCoeff);
MOZ_ASSERT(!mTargetDuration.IsZero());
Expand Down
9 changes: 0 additions & 9 deletions gfx/layers/apz/src/AsyncPanZoomController.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3064,15 +3064,6 @@ ParentLayerPoint AsyncPanZoomController::AttemptFling(const FlingHandoffState& a
residualVelocity.y = 0;
}

// If we're not scrollable in at least one of the directions in which we
// were handed velocity, don't start a fling animation.
if (GetVelocityVector().Length() < gfxPrefs::APZFlingMinVelocityThreshold()) {
// Relieve overscroll now if needed, since we will not transition to a fling
// animation and then an overscroll animation, and relieve it then.
aHandoffState.mChain->SnapBackOverscrolledApzc(this);
return residualVelocity;
}

// If there's a scroll snap point near the predicted fling destination,
// scroll there using a smooth scroll animation. Otherwise, start a
// fling animation.
Expand Down

0 comments on commit 5655897

Please sign in to comment.