Bug 1875011 - Rename GetScrollPositionCSSPixels to GetRoundedScrollPo…

…sitionCSSPixels. r=botond

Differential Revision: https://phabricator.services.mozilla.com/D198766

dom/base/Element.cpp

@@ -822,7 +822,7 @@ void Element::Scroll(double aXScroll, double aYScroll) {
 void Element::Scroll(const ScrollToOptions& aOptions) {
   nsIScrollableFrame* sf = GetScrollFrame();
   if (sf) {
-    CSSIntPoint scrollPos = sf->GetScrollPositionCSSPixels();
+    CSSIntPoint scrollPos = sf->GetRoundedScrollPositionCSSPixels();
     if (aOptions.mLeft.WasPassed()) {
       scrollPos.x = static_cast<int32_t>(
           mozilla::ToZeroIfNonfinite(aOptions.mLeft.Value()));
@@ -874,7 +874,7 @@ void Element::ScrollBy(const ScrollToOptions& aOptions) {
 
 int32_t Element::ScrollTop() {
   nsIScrollableFrame* sf = GetScrollFrame();
-  return sf ? sf->GetScrollPositionCSSPixels().y.value : 0;
+  return sf ? sf->GetRoundedScrollPositionCSSPixels().y.value : 0;
 }
 
 void Element::SetScrollTop(int32_t aScrollTop) {
@@ -892,14 +892,14 @@ void Element::SetScrollTop(int32_t aScrollTop) {
         sf->IsSmoothScroll() ? ScrollMode::SmoothMsd : ScrollMode::Instant;
 
     sf->ScrollToCSSPixels(
-        CSSIntPoint(sf->GetScrollPositionCSSPixels().x, aScrollTop),
+        CSSIntPoint(sf->GetRoundedScrollPositionCSSPixels().x, aScrollTop),
         scrollMode);
   }
 }
 
 int32_t Element::ScrollLeft() {
   nsIScrollableFrame* sf = GetScrollFrame();
-  return sf ? sf->GetScrollPositionCSSPixels().x.value : 0;
+  return sf ? sf->GetRoundedScrollPositionCSSPixels().x.value : 0;
 }
 
 void Element::SetScrollLeft(int32_t aScrollLeft) {
@@ -912,7 +912,7 @@ void Element::SetScrollLeft(int32_t aScrollLeft) {
         sf->IsSmoothScroll() ? ScrollMode::SmoothMsd : ScrollMode::Instant;
 
     sf->ScrollToCSSPixels(
-        CSSIntPoint(aScrollLeft, sf->GetScrollPositionCSSPixels().y),
+        CSSIntPoint(aScrollLeft, sf->GetRoundedScrollPositionCSSPixels().y),
         scrollMode);
   }
 }

dom/base/nsGlobalWindowInner.cpp

@@ -3827,7 +3827,7 @@ void nsGlobalWindowInner::ScrollTo(const ScrollToOptions& aOptions) {
   nsIScrollableFrame* sf = GetScrollFrame();
 
   if (sf) {
-    CSSIntPoint scrollPos = sf->GetScrollPositionCSSPixels();
+    CSSIntPoint scrollPos = sf->GetRoundedScrollPositionCSSPixels();
     if (aOptions.mLeft.WasPassed()) {
       scrollPos.x = static_cast<int32_t>(
           mozilla::ToZeroIfNonfinite(aOptions.mLeft.Value()));

layout/generic/nsGfxScrollFrame.cpp

@@ -2384,7 +2384,7 @@ void nsHTMLScrollFrame::ScrollToInternal(
 
 void nsHTMLScrollFrame::ScrollToCSSPixels(const CSSIntPoint& aScrollPosition,
                                           ScrollMode aMode) {
-  CSSIntPoint currentCSSPixels = GetScrollPositionCSSPixels();
+  CSSIntPoint currentCSSPixels = GetRoundedScrollPositionCSSPixels();
   // Transmogrify this scroll to a relative one if there's any on-going
   // animation in APZ triggered by __user__.
   // Bug 1740164: We will apply it for cases there's no animation in APZ.
@@ -2446,7 +2446,7 @@ void nsHTMLScrollFrame::ScrollToCSSPixelsForApz(
   // 'this' might be destroyed here
 }
 
-CSSIntPoint nsHTMLScrollFrame::GetScrollPositionCSSPixels() {
+CSSIntPoint nsHTMLScrollFrame::GetRoundedScrollPositionCSSPixels() {
   return CSSIntPoint::FromAppUnitsRounded(GetScrollPosition());
 }
 
@@ -5006,7 +5006,7 @@ void nsHTMLScrollFrame::ScrollByCSSPixelsInternal(const CSSIntPoint& aDelta,
   // the previous scrolling operation, but there may be some edge cases where
   // the current position in CSS pixels differs from the given position, the
   // cases should be fixed in bug 1556685.
-  CSSIntPoint currentCSSPixels = GetScrollPositionCSSPixels();
+  CSSIntPoint currentCSSPixels = GetRoundedScrollPositionCSSPixels();
   nsPoint pt = CSSPoint::ToAppUnits(currentCSSPixels + aDelta);
 
   nscoord halfPixel = nsPresContext::CSSPixelsToAppUnits(0.5f);

layout/generic/nsGfxScrollFrame.h

@@ -271,7 +271,8 @@ class nsHTMLScrollFrame : public nsContainerFrame,
   /**
    * @note This method might destroy the frame, pres shell and other objects.
    */
-  CSSIntPoint GetScrollPositionCSSPixels() final;
+  CSSIntPoint GetRoundedScrollPositionCSSPixels() final;
+
   /**
    * @note This method might destroy the frame, pres shell and other objects.
    */

layout/generic/nsIScrollableFrame.h

@@ -262,21 +262,21 @@ class nsIScrollableFrame : public nsIScrollbarMediator {
    * aScrollPosition.x/y is different from the current CSS pixel position,
    * makes sure we only move in the direction given by the difference.
    *
-   * When aMode is SMOOTH, INSTANT, or NORMAL, GetScrollPositionCSSPixels (the
-   * scroll position after rounding to CSS pixels) will be exactly
+   * When aMode is SMOOTH, INSTANT, or NORMAL, GetRoundedScrollPositionCSSPixels
+   * (the scroll position after rounding to CSS pixels) will be exactly
    * aScrollPosition at the end of the scroll animation.
    *
    * When aMode is SMOOTH_MSD, intermediate animation frames may be outside the
-   * range and / or moving in any direction; GetScrollPositionCSSPixels will be
-   * exactly aScrollPosition at the end of the scroll animation unless the
-   * SMOOTH_MSD animation is interrupted.
+   * range and / or moving in any direction; GetRoundedScrollPositionCSSPixels
+   * will be exactly aScrollPosition at the end of the scroll animation unless
+   * the SMOOTH_MSD animation is interrupted.
    */
   virtual void ScrollToCSSPixels(const CSSIntPoint& aScrollPosition,
                                  ScrollMode aMode = ScrollMode::Instant) = 0;
   /**
    * @note This method might destroy the frame, pres shell and other objects.
    * Scrolls to a particular position in float CSS pixels.
-   * This does not guarantee that GetScrollPositionCSSPixels equals
+   * This does not guarantee that GetRoundedScrollPositionCSSPixels equals
    * aScrollPosition afterward. It tries to scroll as close to
    * aScrollPosition as possible while scrolling by an integer
    * number of layer pixels (so the operation is fast and looks clean).
@@ -289,7 +289,7 @@ class nsIScrollableFrame : public nsIScrollbarMediator {
    * Returns the scroll position in integer CSS pixels, rounded to the nearest
    * pixel.
    */
-  virtual CSSIntPoint GetScrollPositionCSSPixels() = 0;
+  virtual CSSIntPoint GetRoundedScrollPositionCSSPixels() = 0;
   /**
    * @note This method might destroy the frame, pres shell and other objects.
    * Modifies the current scroll position by aDelta units given by aUnit,