corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1264837 Part 45 - Remove SVGViewFrameBase. r=dholbert

Browse Source 
MozReview-Commit-ID: HynJLTOM7ic
This commit is contained in:
Ting-Yu Lin
2016-04-18 15:57:01 +08:00
parent 99ebf6e496
commit a4da8525c0
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
layout/svg/SVGViewFrame.cpp
View File

@@ -10,8 +10,6 @@
#include "mozilla/dom/SVGSVGElement.h" #include "mozilla/dom/SVGSVGElement.h"
#include "mozilla/dom/SVGViewElement.h" #include "mozilla/dom/SVGViewElement.h"
typedef nsFrame SVGViewFrameBase;
using namespace mozilla::dom; using namespace mozilla::dom;
/** /**
@@ -20,13 +18,13 @@ using namespace mozilla::dom;
* identifier. The SVGViewFrame class passes on any attribute changes * identifier. The SVGViewFrame class passes on any attribute changes
* the view receives to the overridden <svg> element (if there is one). * the view receives to the overridden <svg> element (if there is one).
**/ **/
class SVGViewFrame : public SVGViewFrameBase class SVGViewFrame : public nsFrame
{ {
friend nsIFrame* friend nsIFrame*
NS_NewSVGViewFrame(nsIPresShell* aPresShell, nsStyleContext* aContext); NS_NewSVGViewFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
protected: protected:
explicit SVGViewFrame(nsStyleContext* aContext) explicit SVGViewFrame(nsStyleContext* aContext)
: SVGViewFrameBase(aContext) : nsFrame(aContext)
{ {
AddStateBits(NS_FRAME_IS_NONDISPLAY); AddStateBits(NS_FRAME_IS_NONDISPLAY);
} }
@@ -42,7 +40,7 @@ public:
virtual bool IsFrameOfType(uint32_t aFlags) const override virtual bool IsFrameOfType(uint32_t aFlags) const override
{ {
return SVGViewFrameBase::IsFrameOfType(aFlags & ~(nsIFrame::eSVG)); return nsFrame::IsFrameOfType(aFlags & ~(nsIFrame::eSVG));
} }
#ifdef DEBUG_FRAME_DUMP #ifdef DEBUG_FRAME_DUMP
@@ -86,7 +84,7 @@ SVGViewFrame::Init(nsIContent* aContent,
NS_ASSERTION(aContent->IsSVGElement(nsGkAtoms::view), NS_ASSERTION(aContent->IsSVGElement(nsGkAtoms::view),
"Content is not an SVG view"); "Content is not an SVG view");
SVGViewFrameBase::Init(aContent, aParent, aPrevInFlow); nsFrame::Init(aContent, aParent, aPrevInFlow);
} }
#endif /* DEBUG */ #endif /* DEBUG */
@@ -125,6 +123,5 @@ SVGViewFrame::AttributeChanged(int32_t aNameSpaceID,
} }
} }
return SVGViewFrameBase::AttributeChanged(aNameSpaceID, return nsFrame::AttributeChanged(aNameSpaceID, aAttribute, aModType);
aAttribute, aModType);
} }