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

Bug 1264837 Part 12 - Remove nsRubyTextContainerFrameSuper. r=dholbert

Browse Source 
MozReview-Commit-ID: K3n3gsEkP5f
This commit is contained in:
Ting-Yu Lin
2016-04-18 14:12:52 +08:00
parent c8f8c35622
commit 2b89ff9199
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
layout/generic/nsRubyTextContainerFrame.cpp
View File

@@ -60,14 +60,14 @@ nsRubyTextContainerFrame::IsFrameOfType(uint32_t aFlags) const
if (aFlags & eSupportsCSSTransforms) { if (aFlags & eSupportsCSSTransforms) {
return false; return false;
} }
return nsRubyTextContainerFrameSuper::IsFrameOfType(aFlags); return nsContainerFrame::IsFrameOfType(aFlags);
} }
/* virtual */ void /* virtual */ void
nsRubyTextContainerFrame::SetInitialChildList(ChildListID aListID, nsRubyTextContainerFrame::SetInitialChildList(ChildListID aListID,
nsFrameList& aChildList) nsFrameList& aChildList)
{ {
nsRubyTextContainerFrameSuper::SetInitialChildList(aListID, aChildList); nsContainerFrame::SetInitialChildList(aListID, aChildList);
if (aListID == kPrincipalList) { if (aListID == kPrincipalList) {
UpdateSpanFlag(); UpdateSpanFlag();
} }
@@ -77,7 +77,7 @@ nsRubyTextContainerFrame::SetInitialChildList(ChildListID aListID,
nsRubyTextContainerFrame::AppendFrames(ChildListID aListID, nsRubyTextContainerFrame::AppendFrames(ChildListID aListID,
nsFrameList& aFrameList) nsFrameList& aFrameList)
{ {
nsRubyTextContainerFrameSuper::AppendFrames(aListID, aFrameList); nsContainerFrame::AppendFrames(aListID, aFrameList);
UpdateSpanFlag(); UpdateSpanFlag();
} }
@@ -86,7 +86,7 @@ nsRubyTextContainerFrame::InsertFrames(ChildListID aListID,
nsIFrame* aPrevFrame, nsIFrame* aPrevFrame,
nsFrameList& aFrameList) nsFrameList& aFrameList)
{ {
nsRubyTextContainerFrameSuper::InsertFrames(aListID, aPrevFrame, aFrameList); nsContainerFrame::InsertFrames(aListID, aPrevFrame, aFrameList);
UpdateSpanFlag(); UpdateSpanFlag();
} }
@@ -94,7 +94,7 @@ nsRubyTextContainerFrame::InsertFrames(ChildListID aListID,
nsRubyTextContainerFrame::RemoveFrame(ChildListID aListID, nsRubyTextContainerFrame::RemoveFrame(ChildListID aListID,
nsIFrame* aOldFrame) nsIFrame* aOldFrame)
{ {
nsRubyTextContainerFrameSuper::RemoveFrame(aListID, aOldFrame); nsContainerFrame::RemoveFrame(aListID, aOldFrame);
UpdateSpanFlag(); UpdateSpanFlag();
} }

6
layout/generic/nsRubyTextContainerFrame.h
View File

@@ -11,8 +11,6 @@
#include "nsBlockFrame.h" #include "nsBlockFrame.h"
typedef nsContainerFrame nsRubyTextContainerFrameSuper;
/** /**
* Factory function. * Factory function.
* @return a newly allocated nsRubyTextContainerFrame (infallible) * @return a newly allocated nsRubyTextContainerFrame (infallible)
@@ -20,7 +18,7 @@ typedef nsContainerFrame nsRubyTextContainerFrameSuper;
nsContainerFrame* NS_NewRubyTextContainerFrame(nsIPresShell* aPresShell, nsContainerFrame* NS_NewRubyTextContainerFrame(nsIPresShell* aPresShell,
nsStyleContext* aContext); nsStyleContext* aContext);
class nsRubyTextContainerFrame final : public nsRubyTextContainerFrameSuper class nsRubyTextContainerFrame final : public nsContainerFrame
{ {
public: public:
NS_DECL_FRAMEARENA_HELPERS NS_DECL_FRAMEARENA_HELPERS
@@ -59,7 +57,7 @@ protected:
NS_NewRubyTextContainerFrame(nsIPresShell* aPresShell, NS_NewRubyTextContainerFrame(nsIPresShell* aPresShell,
nsStyleContext* aContext); nsStyleContext* aContext);
explicit nsRubyTextContainerFrame(nsStyleContext* aContext) explicit nsRubyTextContainerFrame(nsStyleContext* aContext)
: nsRubyTextContainerFrameSuper(aContext) : nsContainerFrame(aContext)
, mISize(0) {} , mISize(0) {}
void UpdateSpanFlag(); void UpdateSpanFlag();