Commit c16d8c3e authored by Dan Robertson's avatar Dan Robertson
Browse files

Bug 1785103 - Move ScrollFrameHelper::SetTransformingByAPZ(() definition out-of-line. r=botond 

Differential Revision: https://phabricator.services.mozilla.com/D155590
parent 431f95bf

layout/generic/nsGfxScrollFrame.cpp

+13 −0
Original line number Diff line number Diff line
@@ -2471,6 +2471,19 @@ void ScrollFrameHelper::AsyncScrollCallback(ScrollFrameHelper* aInstance, 
                                 aInstance->mAsyncScroll->TakeSnapTargetIds());

}



void ScrollFrameHelper::SetTransformingByAPZ(bool aTransforming) {

  if (mTransformingByAPZ && !aTransforming) {

    PostScrollEndEvent();

  }

  mTransformingByAPZ = aTransforming;

  if (!mozilla::css::TextOverflow::HasClippedTextOverflow(mOuter) ||

      mozilla::css::TextOverflow::HasBlockEllipsis(mScrolledFrame)) {

    // If the block has some overflow marker stuff we should kick off a paint

    // because we have special behaviour for it when APZ scrolling is active.

    mOuter->SchedulePaint();

  }

}



void ScrollFrameHelper::CompleteAsyncScroll(

    const nsRect& aRange, UniquePtr<ScrollSnapTargetIds> aSnapTargetIds,

    ScrollOrigin aOrigin) {

layout/generic/nsGfxScrollFrame.h

+1 −12
Original line number Diff line number Diff line
@@ -469,18 +469,7 @@ class ScrollFrameHelper : public nsIReflowCallback { 
  void MarkNotRecentlyScrolled();

  nsExpirationState* GetExpirationState() { return &mActivityExpirationState; }



  void SetTransformingByAPZ(bool aTransforming) {

    if (mTransformingByAPZ && !aTransforming) {

      PostScrollEndEvent();

    }

    mTransformingByAPZ = aTransforming;

    if (!mozilla::css::TextOverflow::HasClippedTextOverflow(mOuter) ||

        mozilla::css::TextOverflow::HasBlockEllipsis(mScrolledFrame)) {

      // If the block has some overflow marker stuff we should kick off a paint

      // because we have special behaviour for it when APZ scrolling is active.

      mOuter->SchedulePaint();

    }

  }

  void SetTransformingByAPZ(bool aTransforming);

  bool IsTransformingByAPZ() const { return mTransformingByAPZ; }

  void SetScrollableByAPZ(bool aScrollable);

  void SetZoomableByAPZ(bool aZoomable);