Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 22:01:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1264837 Part 12 - Remove nsRubyTextContainerFrameSuper. r=dholbert

Browse Source 
MozReview-Commit-ID: K3n3gsEkP5f

--HG--
extra : rebase_source : f7f227616ee4f07752a2450381a743613eafaa56
This commit is contained in:
Ting-Yu Lin 2016-04-18 14:12:52 +08:00
parent 29eadce873
commit e1e171c84e
2 changed files with 7 additions and 9 deletions
Show Stats 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) {
return false;
}
return nsRubyTextContainerFrameSuper::IsFrameOfType(aFlags);
return nsContainerFrame::IsFrameOfType(aFlags);
}
/* virtual */ void
nsRubyTextContainerFrame::SetInitialChildList(ChildListID aListID,
nsFrameList& aChildList)
{
nsRubyTextContainerFrameSuper::SetInitialChildList(aListID, aChildList);
nsContainerFrame::SetInitialChildList(aListID, aChildList);
if (aListID == kPrincipalList) {
UpdateSpanFlag();
}
@ -77,7 +77,7 @@ nsRubyTextContainerFrame::SetInitialChildList(ChildListID aListID,
nsRubyTextContainerFrame::AppendFrames(ChildListID aListID,
nsFrameList& aFrameList)
{
nsRubyTextContainerFrameSuper::AppendFrames(aListID, aFrameList);
nsContainerFrame::AppendFrames(aListID, aFrameList);
UpdateSpanFlag();
}
@ -86,7 +86,7 @@ nsRubyTextContainerFrame::InsertFrames(ChildListID aListID,
nsIFrame* aPrevFrame,
nsFrameList& aFrameList)
{
nsRubyTextContainerFrameSuper::InsertFrames(aListID, aPrevFrame, aFrameList);
nsContainerFrame::InsertFrames(aListID, aPrevFrame, aFrameList);
UpdateSpanFlag();
}
@ -94,7 +94,7 @@ nsRubyTextContainerFrame::InsertFrames(ChildListID aListID,
nsRubyTextContainerFrame::RemoveFrame(ChildListID aListID,
nsIFrame* aOldFrame)
{
nsRubyTextContainerFrameSuper::RemoveFrame(aListID, aOldFrame);
nsContainerFrame::RemoveFrame(aListID, aOldFrame);
UpdateSpanFlag();
}

6
layout/generic/nsRubyTextContainerFrame.h
View File

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