Bug 1309804 - Part 1. Rename nsDisplaySVGEffectsGeometry to nsDisplayMaskGeometry.
MozReview-Commit-ID: 9RtT7kbMlbM
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -6782,18 +6782,18 @@ nsDisplaySVGEffects::UserSpaceOffset() c
return nsSVGUtils::FrameSpaceInCSSPxToUserSpaceOffset(mFrame);
}
void
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() ||
geometry->mUserSpaceOffset != UserSpaceOffset() ||
!geometry->mBBox.IsEqualInterior(BBoxInUserSpace())) {
// Filter and mask output can depend on the location of the frame's user
// space and on the frame's BBox. We need to invalidate if either of these
// change relative to the reference frame.
@@ -7069,17 +7069,17 @@ nsDisplayMask::PaintAsLayer(nsDisplayLis
ComputeMaskGeometry(params);
image::DrawResult result =
nsSVGIntegrationUtils::PaintMaskAndClipPath(params);
context->PopClip();
- nsDisplaySVGEffectsGeometry::UpdateDrawResult(this, result);
+ nsDisplayMaskGeometry::UpdateDrawResult(this, result);
}
#ifdef MOZ_DUMP_PAINTING
void
nsDisplayMask::PrintEffects(nsACString& aTo)
{
nsIFrame* firstFrame =
nsLayoutUtils::FirstContinuationOrIBSplitSibling(mFrame);
@@ -7226,17 +7226,17 @@ nsDisplayFilter::PaintAsLayer(nsDisplayL
mFrame, mVisibleRect,
borderArea, aBuilder,
aManager,
mHandleOpacity);
image::DrawResult result =
nsSVGIntegrationUtils::PaintFilter(params);
- nsDisplaySVGEffectsGeometry::UpdateDrawResult(this, result);
+ nsDisplayMaskGeometry::UpdateDrawResult(this, result);
}
#ifdef MOZ_DUMP_PAINTING
void
nsDisplayFilter::PrintEffects(nsACString& aTo)
{
nsIFrame* firstFrame =
nsLayoutUtils::FirstContinuationOrIBSplitSibling(mFrame);
--- a/layout/base/nsDisplayList.h
+++ b/layout/base/nsDisplayList.h
@@ -3858,17 +3858,17 @@ public:
return false;
}
gfxRect BBoxInUserSpace() const;
gfxPoint UserSpaceOffset() const;
virtual nsDisplayItemGeometry* AllocateGeometry(nsDisplayListBuilder* aBuilder) override
{
- return new nsDisplaySVGEffectsGeometry(this, aBuilder);
+ return new nsDisplayMaskGeometry(this, aBuilder);
}
virtual void ComputeInvalidationRegion(nsDisplayListBuilder* aBuilder,
const nsDisplayItemGeometry* aGeometry,
nsRegion* aInvalidRegion) override;
protected:
bool ValidateSVGFrame();
// relative to mFrame
--- a/layout/base/nsDisplayListInvalidation.cpp
+++ b/layout/base/nsDisplayListInvalidation.cpp
@@ -108,26 +108,26 @@ nsDisplayBoxShadowOuterGeometry::nsDispl
void
nsDisplaySolidColorRegionGeometry::MoveBy(const nsPoint& aOffset)
{
nsDisplayItemGeometry::MoveBy(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())
, mUserSpaceOffset(aItem->UserSpaceOffset())
, mFrameOffsetToReferenceFrame(aItem->ToReferenceFrame())
{}
void
-nsDisplaySVGEffectsGeometry::MoveBy(const nsPoint& aOffset)
+nsDisplayMaskGeometry::MoveBy(const nsPoint& aOffset)
{
mBounds.MoveBy(aOffset);
mFrameOffsetToReferenceFrame += aOffset;
}
nsCharClipGeometry::nsCharClipGeometry(nsCharClipDisplayItem* aItem, nsDisplayListBuilder* aBuilder)
: nsDisplayItemGenericGeometry(aItem, aBuilder)
, mVisIStartEdge(aItem->mVisIStartEdge)
--- a/layout/base/nsDisplayListInvalidation.h
+++ b/layout/base/nsDisplayListInvalidation.h
@@ -260,21 +260,21 @@ public:
{ }
virtual void MoveBy(const nsPoint& aOffset) override;
nsRegion mRegion;
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;
gfxRect mBBox;
gfxPoint mUserSpaceOffset;
nsPoint mFrameOffsetToReferenceFrame;
};