Bug 1494285 p1. Rename nsDisplaySVGEffects to nsDisplayEffectsBase. r=miko

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

--HG--
extra : rebase_source : f0b19827de42cbbab9d802bfd566fbb9fc8103e9
extra : amend_source : 37638ca71c6ce5d1cb4f697b362137bc93cfffa4
extra : histedit_source : c7f2b666e3666921804563d51e3de35af9294930

layout/painting/nsDisplayList.cpp

@@ -9445,7 +9445,7 @@ nsCharClipDisplayItem::ComputeInvalidationRegion(
   }
 }
 
-nsDisplaySVGEffects::nsDisplaySVGEffects(
+nsDisplayEffectsBase::nsDisplayEffectsBase(
   nsDisplayListBuilder* aBuilder,
   nsIFrame* aFrame,
   nsDisplayList* aList,
@@ -9459,32 +9459,32 @@ nsDisplaySVGEffects::nsDisplaySVGEffects(
                       aClearClipChain)
   , mHandleOpacity(aHandleOpacity)
 {
-  MOZ_COUNT_CTOR(nsDisplaySVGEffects);
+  MOZ_COUNT_CTOR(nsDisplayEffectsBase);
 }
 
-nsDisplaySVGEffects::nsDisplaySVGEffects(nsDisplayListBuilder* aBuilder,
-                                         nsIFrame* aFrame,
-                                         nsDisplayList* aList,
-                                         bool aHandleOpacity)
+nsDisplayEffectsBase::nsDisplayEffectsBase(nsDisplayListBuilder* aBuilder,
+                                           nsIFrame* aFrame,
+                                           nsDisplayList* aList,
+                                           bool aHandleOpacity)
   : nsDisplayWrapList(aBuilder, aFrame, aList)
   , mHandleOpacity(aHandleOpacity)
 {
-  MOZ_COUNT_CTOR(nsDisplaySVGEffects);
+  MOZ_COUNT_CTOR(nsDisplayEffectsBase);
 }
 
 nsRegion
-nsDisplaySVGEffects::GetOpaqueRegion(nsDisplayListBuilder* aBuilder,
-                                     bool* aSnap) const
+nsDisplayEffectsBase::GetOpaqueRegion(nsDisplayListBuilder* aBuilder,
+                                      bool* aSnap) const
 {
   *aSnap = false;
   return nsRegion();
 }
 
 void
-nsDisplaySVGEffects::HitTest(nsDisplayListBuilder* aBuilder,
-                             const nsRect& aRect,
-                             HitTestState* aState,
-                             nsTArray<nsIFrame*>* aOutFrames)
+nsDisplayEffectsBase::HitTest(nsDisplayListBuilder* aBuilder,
+                              const nsRect& aRect,
+                              HitTestState* aState,
+                              nsTArray<nsIFrame*>* aOutFrames)
 {
   nsPoint rectCenter(aRect.x + aRect.width / 2, aRect.y + aRect.height / 2);
   if (nsSVGIntegrationUtils::HitTestFrameForEffects(
@@ -9494,19 +9494,19 @@ nsDisplaySVGEffects::HitTest(nsDisplayListBuilder* aBuilder,
 }
 
 gfxRect
-nsDisplaySVGEffects::BBoxInUserSpace() const
+nsDisplayEffectsBase::BBoxInUserSpace() const
 {
   return nsSVGUtils::GetBBox(mFrame);
 }
 
 gfxPoint
-nsDisplaySVGEffects::UserSpaceOffset() const
+nsDisplayEffectsBase::UserSpaceOffset() const
 {
   return nsSVGUtils::FrameSpaceInCSSPxToUserSpaceOffset(mFrame);
 }
 
 void
-nsDisplaySVGEffects::ComputeInvalidationRegion(
+nsDisplayEffectsBase::ComputeInvalidationRegion(
   nsDisplayListBuilder* aBuilder,
   const nsDisplayItemGeometry* aGeometry,
   nsRegion* aInvalidRegion) const
@@ -9528,7 +9528,7 @@ nsDisplaySVGEffects::ComputeInvalidationRegion(
 }
 
 bool
-nsDisplaySVGEffects::ValidateSVGFrame()
+nsDisplayEffectsBase::ValidateSVGFrame()
 {
   const nsIContent* content = mFrame->GetContent();
   bool hasSVGLayout = (mFrame->GetStateBits() & NS_FRAME_SVG_LAYOUT);
@@ -9638,12 +9638,12 @@ nsDisplayMask::nsDisplayMask(nsDisplayListBuilder* aBuilder,
                              nsDisplayList* aList,
                              bool aHandleOpacity,
                              const ActiveScrolledRoot* aActiveScrolledRoot)
-  : nsDisplaySVGEffects(aBuilder,
-                        aFrame,
-                        aList,
-                        aHandleOpacity,
-                        aActiveScrolledRoot,
-                        true)
+  : nsDisplayEffectsBase(aBuilder,
+                         aFrame,
+                         aList,
+                         aHandleOpacity,
+                         aActiveScrolledRoot,
+                         true)
 {
   MOZ_COUNT_CTOR(nsDisplayMask);
 
@@ -9830,7 +9830,7 @@ nsDisplayMask::ComputeInvalidationRegion(nsDisplayListBuilder* aBuilder,
                                          const nsDisplayItemGeometry* aGeometry,
                                          nsRegion* aInvalidRegion) const
 {
-  nsDisplaySVGEffects::ComputeInvalidationRegion(
+  nsDisplayEffectsBase::ComputeInvalidationRegion(
     aBuilder, aGeometry, aInvalidRegion);
 
   auto* geometry = static_cast<const nsDisplayMaskGeometry*>(aGeometry);
@@ -9990,7 +9990,7 @@ nsDisplayMask::CreateWebRenderCommands(
                                                   Nothing());
   }
 
-  nsDisplaySVGEffects::CreateWebRenderCommands(
+  nsDisplayEffectsBase::CreateWebRenderCommands(
     aBuilder, aResources, *sc, aManager, aDisplayListBuilder);
 
   if (mask) {
@@ -10070,7 +10070,7 @@ nsDisplayFilter::nsDisplayFilter(nsDisplayListBuilder* aBuilder,
                                  nsIFrame* aFrame,
                                  nsDisplayList* aList,
                                  bool aHandleOpacity)
-  : nsDisplaySVGEffects(aBuilder, aFrame, aList, aHandleOpacity)
+  : nsDisplayEffectsBase(aBuilder, aFrame, aList, aHandleOpacity)
   , mEffectsBounds(aFrame->GetVisualOverflowRectRelativeToSelf())
 {
   MOZ_COUNT_CTOR(nsDisplayFilter);
@@ -10147,7 +10147,7 @@ nsDisplayFilter::ComputeInvalidationRegion(
   const nsDisplayItemGeometry* aGeometry,
   nsRegion* aInvalidRegion) const
 {
-  nsDisplaySVGEffects::ComputeInvalidationRegion(
+  nsDisplayEffectsBase::ComputeInvalidationRegion(
     aBuilder, aGeometry, aInvalidRegion);
 
   auto* geometry = static_cast<const nsDisplayFilterGeometry*>(aGeometry);
@@ -10304,7 +10304,7 @@ nsDisplayFilter::CreateWebRenderCommands(
   aManager->CommandBuilder().PushOverrideForASR(GetActiveScrolledRoot(),
                                                 Nothing());
 
-  nsDisplaySVGEffects::CreateWebRenderCommands(
+  nsDisplayEffectsBase::CreateWebRenderCommands(
     aBuilder, aResources, sc, aManager, aDisplayListBuilder);
 
   aManager->CommandBuilder().PopOverrideForASR(GetActiveScrolledRoot());

layout/painting/nsDisplayList.h

@@ -6659,31 +6659,34 @@ private:
   int32_t mAPD, mParentAPD;
 };
 
-class nsDisplaySVGEffects : public nsDisplayWrapList
+/**
+ * A base class for different effects types.
+ */
+class nsDisplayEffectsBase : public nsDisplayWrapList
 {
 public:
-  nsDisplaySVGEffects(nsDisplayListBuilder* aBuilder,
-                      nsIFrame* aFrame,
-                      nsDisplayList* aList,
-                      bool aHandleOpacity,
-                      const ActiveScrolledRoot* aActiveScrolledRoot,
-                      bool aClearClipChain = false);
-  nsDisplaySVGEffects(nsDisplayListBuilder* aBuilder,
-                      nsIFrame* aFrame,
-                      nsDisplayList* aList,
-                      bool aHandleOpacity);
+  nsDisplayEffectsBase(nsDisplayListBuilder* aBuilder,
+                       nsIFrame* aFrame,
+                       nsDisplayList* aList,
+                       bool aHandleOpacity,
+                       const ActiveScrolledRoot* aActiveScrolledRoot,
+                       bool aClearClipChain = false);
+  nsDisplayEffectsBase(nsDisplayListBuilder* aBuilder,
+                       nsIFrame* aFrame,
+                       nsDisplayList* aList,
+                       bool aHandleOpacity);
 
-  nsDisplaySVGEffects(nsDisplayListBuilder* aBuilder,
-                      const nsDisplaySVGEffects& aOther)
+  nsDisplayEffectsBase(nsDisplayListBuilder* aBuilder,
+                       const nsDisplayEffectsBase& aOther)
     : nsDisplayWrapList(aBuilder, aOther)
     , mEffectsBounds(aOther.mEffectsBounds)
     , mHandleOpacity(aOther.mHandleOpacity)
   {
-    MOZ_COUNT_CTOR(nsDisplaySVGEffects);
+    MOZ_COUNT_CTOR(nsDisplayEffectsBase);
   }
 
 #ifdef NS_BUILD_REFCNT_LOGGING
-  ~nsDisplaySVGEffects() override { MOZ_COUNT_DTOR(nsDisplaySVGEffects); }
+  ~nsDisplayEffectsBase() override { MOZ_COUNT_DTOR(nsDisplayEffectsBase); }
 #endif
 
   nsRegion GetOpaqueRegion(nsDisplayListBuilder* aBuilder,
@@ -6720,7 +6723,7 @@ protected:
  * A display item to paint a stacking context with mask and clip effects
  * set by the stacking context root frame's style.
  */
-class nsDisplayMask : public nsDisplaySVGEffects
+class nsDisplayMask : public nsDisplayEffectsBase
 {
 public:
   typedef mozilla::layers::ImageLayer ImageLayer;
@@ -6731,7 +6734,7 @@ public:
                 bool aHandleOpacity,
                 const ActiveScrolledRoot* aActiveScrolledRoot);
   nsDisplayMask(nsDisplayListBuilder* aBuilder, const nsDisplayMask& aOther)
-    : nsDisplaySVGEffects(aBuilder, aOther)
+    : nsDisplayEffectsBase(aBuilder, aOther)
     , mDestRects(aOther.mDestRects)
   {
   }
@@ -6828,7 +6831,7 @@ private:
  * A display item to paint a stacking context with filter effects set by the
  * stacking context root frame's style.
  */
-class nsDisplayFilter : public nsDisplaySVGEffects
+class nsDisplayFilter : public nsDisplayEffectsBase
 {
 public:
   nsDisplayFilter(nsDisplayListBuilder* aBuilder,
@@ -6837,7 +6840,7 @@ public:
                   bool aHandleOpacity);
 
   nsDisplayFilter(nsDisplayListBuilder* aBuilder, const nsDisplayFilter& aOther)
-    : nsDisplaySVGEffects(aBuilder, aOther)
+    : nsDisplayEffectsBase(aBuilder, aOther)
     , mEffectsBounds(aOther.mEffectsBounds)
   {
   }

layout/painting/nsDisplayListInvalidation.cpp

@@ -125,7 +125,7 @@ nsDisplaySolidColorRegionGeometry::MoveBy(const nsPoint& aOffset)
 }
 
 nsDisplaySVGEffectGeometry::nsDisplaySVGEffectGeometry(
-  nsDisplaySVGEffects* aItem,
+  nsDisplayEffectsBase* aItem,
   nsDisplayListBuilder* aBuilder)
   : nsDisplayItemGeometry(aItem, aBuilder)
   , mBBox(aItem->BBoxInUserSpace())

layout/painting/nsDisplayListInvalidation.h

@@ -21,7 +21,7 @@ class nsDisplayItem;
 class nsDisplayListBuilder;
 class nsDisplayTableItem;
 class nsDisplayThemedBackground;
-class nsDisplaySVGEffects;
+class nsDisplayEffectsBase;
 class nsDisplayMask;
 class nsDisplayFilter;
 
@@ -294,7 +294,7 @@ public:
 class nsDisplaySVGEffectGeometry : public nsDisplayItemGeometry
 {
 public:
-  nsDisplaySVGEffectGeometry(nsDisplaySVGEffects* aItem,
+  nsDisplaySVGEffectGeometry(nsDisplayEffectsBase* aItem,
                              nsDisplayListBuilder* aBuilder);
 
   void MoveBy(const nsPoint& aOffset) override;