Bug 1264837 Part 23 - Remove nsSVGGFrameBase.
MozReview-Commit-ID: 1QzQaR9tUIZ
--- a/layout/svg/nsSVGGFrame.cpp
+++ b/layout/svg/nsSVGGFrame.cpp
@@ -16,33 +16,33 @@
using namespace mozilla::dom;
//----------------------------------------------------------------------
// Implementation
nsIFrame*
NS_NewSVGGFrame(nsIPresShell* aPresShell, nsStyleContext* aContext)
-{
+{
return new (aPresShell) nsSVGGFrame(aContext);
}
NS_IMPL_FRAMEARENA_HELPERS(nsSVGGFrame)
#ifdef DEBUG
void
nsSVGGFrame::Init(nsIContent* aContent,
nsContainerFrame* aParent,
nsIFrame* aPrevInFlow)
{
NS_ASSERTION(aContent->IsSVGElement() &&
static_cast<nsSVGElement*>(aContent)->IsTransformable(),
"The element doesn't support nsIDOMSVGTransformable");
- nsSVGGFrameBase::Init(aContent, aParent, aPrevInFlow);
+ nsSVGDisplayContainerFrame::Init(aContent, aParent, aPrevInFlow);
}
#endif /* DEBUG */
nsIAtom *
nsSVGGFrame::GetType() const
{
return nsGkAtoms::svgGFrame;
}
@@ -56,17 +56,17 @@ nsSVGGFrame::NotifySVGChanged(uint32_t a
MOZ_ASSERT(aFlags & (TRANSFORM_CHANGED | COORD_CONTEXT_CHANGED),
"Invalidation logic may need adjusting");
if (aFlags & TRANSFORM_CHANGED) {
// make sure our cached transform matrix gets (lazily) updated
mCanvasTM = nullptr;
}
- nsSVGGFrameBase::NotifySVGChanged(aFlags);
+ nsSVGDisplayContainerFrame::NotifySVGChanged(aFlags);
}
gfxMatrix
nsSVGGFrame::GetCanvasTM()
{
if (!mCanvasTM) {
NS_ASSERTION(GetParent(), "null parent");
@@ -88,11 +88,11 @@ nsSVGGFrame::AttributeChanged(int32_t
if (aNameSpaceID == kNameSpaceID_None &&
aAttribute == nsGkAtoms::transform) {
// We don't invalidate for transform changes (the layers code does that).
// Also note that SVGTransformableElement::GetAttributeChangeHint will
// return nsChangeHint_UpdateOverflow for "transform" attribute changes
// and cause DoApplyRenderingChangeToTree to make the SchedulePaint call.
NotifySVGChanged(TRANSFORM_CHANGED);
}
-
+
return NS_OK;
}
--- a/layout/svg/nsSVGGFrame.h
+++ b/layout/svg/nsSVGGFrame.h
@@ -5,25 +5,23 @@
#ifndef NSSVGGFRAME_H
#define NSSVGGFRAME_H
#include "mozilla/Attributes.h"
#include "gfxMatrix.h"
#include "nsSVGContainerFrame.h"
-typedef nsSVGDisplayContainerFrame nsSVGGFrameBase;
-
-class nsSVGGFrame : public nsSVGGFrameBase
+class nsSVGGFrame : public nsSVGDisplayContainerFrame
{
friend nsIFrame*
NS_NewSVGGFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
protected:
- explicit nsSVGGFrame(nsStyleContext* aContext) :
- nsSVGGFrameBase(aContext) {}
+ explicit nsSVGGFrame(nsStyleContext* aContext)
+ : nsSVGDisplayContainerFrame(aContext) {}
public:
NS_DECL_FRAMEARENA_HELPERS
#ifdef DEBUG
virtual void Init(nsIContent* aContent,
nsContainerFrame* aParent,
nsIFrame* aPrevInFlow) override;