Commit dff7eb2f authored by Mats Palmgren's avatar Mats Palmgren
Browse files

Bug 454872. r=roc

parent c66b89db

view/src/nsScrollPortView.cpp

+5 −0
Original line number Diff line number Diff line
@@ -847,15 +847,20 @@ nsScrollPortView::IncrementalScroll() 
  if (!mAsyncScroll)

    return;



  nsWeakView thisView = this;

  if (mAsyncScroll->mIsSmoothScroll) {

    if (mAsyncScroll->mFrameIndex < SMOOTH_SCROLL_FRAMES) {

      ScrollToImpl(mOffsetX + mAsyncScroll->mVelocities[mAsyncScroll->mFrameIndex*2],

                   mOffsetY + mAsyncScroll->mVelocities[mAsyncScroll->mFrameIndex*2 + 1]);

      if (!thisView.IsAlive())

        return;

      mAsyncScroll->mFrameIndex++;

      return;

    }

  } else {

    ScrollToImpl(mDestinationX, mDestinationY);

    if (!thisView.IsAlive())

      return;

  }

  delete mAsyncScroll;

  mAsyncScroll = nsnull;