Bug 1824877 Part 1 - Rename nsGfxScrollFrame.{h,cpp} to ScrollContainerFrame.{h,cpp}. r=dholbert

Remove the #include from `nsFrameState.cpp` because it is not used.

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

build/sanitizers/ubsan_signed_overflow_blacklist.txt

@@ -201,7 +201,7 @@ fun:*nsDOMNavigationTiming*TimeStampToDOM*
 # Several unsigned arithmetic operations with -1
 src:*/hal/HalWakeLock.cpp
 
-# Code in layout/generic/nsGfxScrollFrame.cpp that produces
+# Code in layout/generic/ScrollContainerFrame.cpp that produces
 # somewhat frequent signed integer overflows. Probably harmless
 # because it's layout code.
 fun:*ClampAndAlignWithPixels*

build/sanitizers/ubsan_unsigned_overflow_blacklist.txt

@@ -208,7 +208,7 @@ fun:*nsDOMNavigationTiming*TimeStampToDOM*
 # Several unsigned arithmetic operations with -1
 src:*/hal/HalWakeLock.cpp
 
-# Code in layout/generic/nsGfxScrollFrame.cpp that produces
+# Code in layout/generic/ScrollContainerFrame.cpp that produces
 # somewhat frequent signed integer overflows. Probably harmless
 # because it's layout code.
 fun:*ClampAndAlignWithPixels*

dom/base/VisualViewport.h

@@ -45,7 +45,7 @@ class VisualViewport final : public mozilla::DOMEventTargetHelper {
                        const nsPoint& aPrevLayoutOffset);
 
   // These two events are modelled after the ScrollEvent class in
-  // nsGfxScrollFrame.h.
+  // ScrollContainerFrame.h.
   class VisualViewportResizeEvent : public Runnable {
    public:
     NS_DECL_NSIRUNNABLE

layout/base/nsCSSFrameConstructor.cpp

@@ -95,13 +95,13 @@
 #include "nsStyleStructInlines.h"
 #include "nsPageContentFrame.h"
 #include "mozilla/RestyleManager.h"
+#include "mozilla/ScrollContainerFrame.h"
 #include "StickyScrollContainer.h"
 #include "nsFieldSetFrame.h"
 #include "nsInlineFrame.h"
 #include "nsBlockFrame.h"
 #include "nsCanvasFrame.h"
 #include "nsFirstLetterFrame.h"
-#include "nsGfxScrollFrame.h"
 #include "nsPageFrame.h"
 #include "nsPageSequenceFrame.h"
 #include "nsTableWrapperFrame.h"

layout/forms/nsListControlFrame.h

@@ -18,8 +18,8 @@
 #endif
 
 #include "mozilla/Attributes.h"
+#include "mozilla/ScrollContainerFrame.h"
 #include "mozilla/StaticPtr.h"
-#include "nsGfxScrollFrame.h"
 #include "nsIFormControlFrame.h"
 #include "nsISelectControlFrame.h"
 #include "nsSelectsAreaFrame.h"

layout/generic/ScrollAnchorContainer.cpp

@@ -11,10 +11,10 @@
 #include "mozilla/ScopeExit.h"
 #include "mozilla/PresShell.h"
 #include "mozilla/ProfilerLabels.h"
+#include "mozilla/ScrollContainerFrame.h"
 #include "mozilla/StaticPrefs_layout.h"
 #include "mozilla/ToString.h"
 #include "nsBlockFrame.h"
-#include "nsGfxScrollFrame.h"
 #include "nsIFrame.h"
 #include "nsIFrameInlines.h"
 #include "nsLayoutUtils.h"

layout/generic/ScrollContainerFrame.cpp

@@ -6,7 +6,7 @@
 
 /* rendering object to wrap rendering objects that should be scrollable */
 
-#include "nsGfxScrollFrame.h"
+#include "mozilla/ScrollContainerFrame.h"
 
 #include "ScrollPositionUpdate.h"
 #include "mozilla/layers/LayersTypes.h"

layout/generic/ScrollContainerFrame.h

@@ -6,8 +6,8 @@
 
 /* rendering object to wrap rendering objects that should be scrollable */
 
-#ifndef nsGfxScrollFrame_h___
+#ifndef mozilla_ScrollContainerFrame_h_
-#define nsGfxScrollFrame_h___
+#define mozilla_ScrollContainerFrame_h_
 
 #include "mozilla/Attributes.h"
 #include "nsContainerFrame.h"
@@ -1093,4 +1093,4 @@ class nsHTMLScrollFrame : public nsContainerFrame,
 
 MOZ_MAKE_ENUM_CLASS_BITWISE_OPERATORS(nsHTMLScrollFrame::OverflowState)
 
-#endif /* nsGfxScrollFrame_h___ */
+#endif /* mozilla_ScrollContainerFrame_h_ */

layout/generic/TextOverflow.cpp

@@ -14,7 +14,6 @@
 #include "nsContentUtils.h"
 #include "nsCSSAnonBoxes.h"
 #include "nsFontMetrics.h"
-#include "nsGfxScrollFrame.h"
 #include "nsIScrollableFrame.h"
 #include "nsLayoutUtils.h"
 #include "nsPresContext.h"
@@ -24,6 +23,7 @@
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/Likely.h"
 #include "mozilla/PresShell.h"
+#include "mozilla/ScrollContainerFrame.h"
 #include "mozilla/dom/Selection.h"
 #include "TextDrawTarget.h"
 

layout/generic/moz.build

@@ -148,6 +148,7 @@ EXPORTS.mozilla += [
     "ReflowInput.h",
     "ReflowOutput.h",
     "ScrollbarPreferences.h",
+    "ScrollContainerFrame.h",
     "ScrollGeneration.h",
     "ScrollOrigin.h",
     "ScrollPositionUpdate.h",
@@ -187,7 +188,6 @@ UNIFIED_SOURCES += [
     "nsFrameSelection.cpp",
     "nsFrameSetFrame.cpp",
     "nsFrameState.cpp",
-    "nsGfxScrollFrame.cpp",
     "nsGridContainerFrame.cpp",
     "nsHTMLCanvasFrame.cpp",
     "nsIFrame.cpp",
@@ -224,6 +224,7 @@ UNIFIED_SOURCES += [
     "ScrollAnimationBezierPhysics.cpp",
     "ScrollAnimationMSDPhysics.cpp",
     "ScrollbarActivity.cpp",
+    "ScrollContainerFrame.cpp",
     "ScrollPositionUpdate.cpp",
     "ScrollSnap.cpp",
     "ScrollSnapInfo.cpp",

layout/generic/nsFrameState.cpp

@@ -11,7 +11,6 @@
 #include "nsBlockFrame.h"
 #include "nsFlexContainerFrame.h"
 #include "nsGridContainerFrame.h"
-#include "nsGfxScrollFrame.h"
 #include "nsIFrame.h"
 #include "nsImageFrame.h"
 #include "nsInlineFrame.h"

layout/generic/nsGridContainerFrame.cpp

@@ -22,6 +22,7 @@
 #include "mozilla/Maybe.h"
 #include "mozilla/PodOperations.h"  // for PodZero
 #include "mozilla/PresShell.h"
+#include "mozilla/ScrollContainerFrame.h"
 #include "mozilla/StaticPrefs_layout.h"
 #include "nsAbsoluteContainingBlock.h"
 #include "nsAlgorithm.h"  // for clamped()
@@ -29,7 +30,6 @@
 #include "nsDisplayList.h"
 #include "nsFieldSetFrame.h"
 #include "nsHTMLButtonControlFrame.h"
-#include "nsGfxScrollFrame.h"
 #include "nsHashKeys.h"
 #include "nsIFrameInlines.h"  // for nsIFrame::GetLogicalNormalPosition (don't remove)
 #include "nsLayoutUtils.h"

layout/generic/nsIFrame.cpp

@@ -36,6 +36,7 @@
 #include "mozilla/PresShell.h"
 #include "mozilla/PresShellInlines.h"
 #include "mozilla/ResultExtensions.h"
+#include "mozilla/ScrollContainerFrame.h"
 #include "mozilla/SelectionMovementUtils.h"
 #include "mozilla/Sprintf.h"
 #include "mozilla/StaticAnalysisFunctions.h"
@@ -85,7 +86,6 @@
 #include "nsFrameSelection.h"
 #include "nsGkAtoms.h"
 #include "nsGridContainerFrame.h"
-#include "nsGfxScrollFrame.h"
 #include "nsCSSAnonBoxes.h"
 #include "nsCanvasFrame.h"
 

layout/xul/nsIScrollbarMediator.h

@@ -65,7 +65,8 @@ class nsIScrollbarMediator : public nsQueryFrame {
    * aOldPos and aNewPos are scroll positions.
    * The scroll positions start with zero at the left edge; implementors that
    * want zero at the right edge for RTL content will need to adjust
-   * accordingly. (See nsHTMLScrollFrame::ThumbMoved in nsGfxScrollFrame.cpp.)
+   * accordingly. (See nsHTMLScrollFrame::ThumbMoved in
+   * ScrollContainerFrame.cpp.)
    * @note This method might destroy the frame, pres shell, and other objects.
    */
   virtual void ThumbMoved(nsScrollbarFrame* aScrollbar, nscoord aOldPos,