Bug 1309804 - Part 1. Rename nsDisplaySVGEffectsGeometry to nsDisplayMaskGeometry. r=mstange

MozReview-Commit-ID: 9RtT7kbMlbM

--HG--
extra : rebase_source : 9913549628fd0f140704f98c59510aa6526d274a

layout/base/nsDisplayList.cpp

@@ -6789,8 +6789,8 @@ nsDisplaySVGEffects::ComputeInvalidationRegion(nsDisplayListBuilder* aBuilder,
                                                const nsDisplayItemGeometry* aGeometry,
                                                nsRegion* aInvalidRegion)
 {
-  const nsDisplaySVGEffectsGeometry* geometry =
-    static_cast<const nsDisplaySVGEffectsGeometry*>(aGeometry);
+  const nsDisplayMaskGeometry* geometry =
+    static_cast<const nsDisplayMaskGeometry*>(aGeometry);
   bool snap;
   nsRect bounds = GetBounds(aBuilder, &snap);
   if (geometry->mFrameOffsetToReferenceFrame != ToReferenceFrame() ||
@@ -7076,7 +7076,7 @@ nsDisplayMask::PaintAsLayer(nsDisplayListBuilder* aBuilder,
 
   context->PopClip();
 
-  nsDisplaySVGEffectsGeometry::UpdateDrawResult(this, result);
+  nsDisplayMaskGeometry::UpdateDrawResult(this, result);
 }
 
 #ifdef MOZ_DUMP_PAINTING
@@ -7233,7 +7233,7 @@ nsDisplayFilter::PaintAsLayer(nsDisplayListBuilder* aBuilder,
   image::DrawResult result =
     nsSVGIntegrationUtils::PaintFilter(params);
 
-  nsDisplaySVGEffectsGeometry::UpdateDrawResult(this, result);
+  nsDisplayMaskGeometry::UpdateDrawResult(this, result);
 }
 
 #ifdef MOZ_DUMP_PAINTING

layout/base/nsDisplayList.h

@@ -3863,7 +3863,7 @@ public:
 
   virtual nsDisplayItemGeometry* AllocateGeometry(nsDisplayListBuilder* aBuilder) override
   {
-    return new nsDisplaySVGEffectsGeometry(this, aBuilder);
+    return new nsDisplayMaskGeometry(this, aBuilder);
   }
   virtual void ComputeInvalidationRegion(nsDisplayListBuilder* aBuilder,
                                          const nsDisplayItemGeometry* aGeometry,

layout/base/nsDisplayListInvalidation.cpp

@@ -113,7 +113,7 @@ nsDisplaySolidColorRegionGeometry::MoveBy(const nsPoint& aOffset)
   mRegion.MoveBy(aOffset);
 }
 
-nsDisplaySVGEffectsGeometry::nsDisplaySVGEffectsGeometry(nsDisplaySVGEffects* aItem, nsDisplayListBuilder* aBuilder)
+nsDisplayMaskGeometry::nsDisplayMaskGeometry(nsDisplaySVGEffects* aItem, nsDisplayListBuilder* aBuilder)
   : nsDisplayItemGeometry(aItem, aBuilder)
   , nsImageGeometryMixin(aItem, aBuilder)
   , mBBox(aItem->BBoxInUserSpace())
@@ -122,7 +122,7 @@ nsDisplaySVGEffectsGeometry::nsDisplaySVGEffectsGeometry(nsDisplaySVGEffects* aI
 {}
 
 void
-nsDisplaySVGEffectsGeometry::MoveBy(const nsPoint& aOffset)
+nsDisplayMaskGeometry::MoveBy(const nsPoint& aOffset)
 {
   mBounds.MoveBy(aOffset);
   mFrameOffsetToReferenceFrame += aOffset;

layout/base/nsDisplayListInvalidation.h

@@ -265,11 +265,11 @@ public:
   mozilla::gfx::Color mColor;
 };
 
-class nsDisplaySVGEffectsGeometry : public nsDisplayItemGeometry
-  , public nsImageGeometryMixin<nsDisplaySVGEffectsGeometry>
+class nsDisplayMaskGeometry : public nsDisplayItemGeometry
+  , public nsImageGeometryMixin<nsDisplayMaskGeometry>
 {
 public:
-  nsDisplaySVGEffectsGeometry(nsDisplaySVGEffects* aItem, nsDisplayListBuilder* aBuilder);
+  nsDisplayMaskGeometry(nsDisplaySVGEffects* aItem, nsDisplayListBuilder* aBuilder);
 
   virtual void MoveBy(const nsPoint& aOffset) override;