wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 836957 part 2: Remove unnecessary nsIFrame::GetSkipSides() overrides whose implementations are in .cpp files. r=mats

Browse Source
This commit is contained in:
Daniel Holbert 2013-02-04 08:17:20 -08:00
parent fbf74bf166
commit 242e2346fa
18 changed files with 4 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
layout/forms/nsFieldSetFrame.cpp
View File

@ -89,7 +89,6 @@ public:
protected:
virtual int GetSkipSides() const;
void ReparentFrameList(const nsFrameList& aFrameList);
// mLegendFrame is a nsLegendFrame or a nsHTMLScrollFrame with the
@ -236,7 +235,6 @@ void
nsFieldSetFrame::PaintBorderBackground(nsRenderingContext& aRenderingContext,
nsPoint aPt, const nsRect& aDirtyRect, uint32_t aBGFlags)
{
int skipSides = GetSkipSides();
const nsStyleBorder* borderStyle = GetStyleBorder();
nscoord topBorder = borderStyle->GetComputedBorderWidth(NS_SIDE_TOP);
@ -275,7 +273,7 @@ nsFieldSetFrame::PaintBorderBackground(nsRenderingContext& aRenderingContext,
aRenderingContext.PushState();
aRenderingContext.IntersectClip(clipRect);
nsCSSRendering::PaintBorder(presContext, aRenderingContext, this,
aDirtyRect, rect, mStyleContext, skipSides);
aDirtyRect, rect, mStyleContext);
aRenderingContext.PopState();
@ -289,7 +287,7 @@ nsFieldSetFrame::PaintBorderBackground(nsRenderingContext& aRenderingContext,
aRenderingContext.PushState();
aRenderingContext.IntersectClip(clipRect);
nsCSSRendering::PaintBorder(presContext, aRenderingContext, this,
aDirtyRect, rect, mStyleContext, skipSides);
aDirtyRect, rect, mStyleContext);
aRenderingContext.PopState();
@ -302,7 +300,7 @@ nsFieldSetFrame::PaintBorderBackground(nsRenderingContext& aRenderingContext,
aRenderingContext.PushState();
aRenderingContext.IntersectClip(clipRect);
nsCSSRendering::PaintBorder(presContext, aRenderingContext, this,
aDirtyRect, rect, mStyleContext, skipSides);
aDirtyRect, rect, mStyleContext);
aRenderingContext.PopState();
} else {
@ -310,7 +308,7 @@ nsFieldSetFrame::PaintBorderBackground(nsRenderingContext& aRenderingContext,
nsCSSRendering::PaintBorder(presContext, aRenderingContext, this,
aDirtyRect,
nsRect(aPt, mRect.Size()),
mStyleContext, skipSides);
mStyleContext);
}
}
@ -581,12 +579,6 @@ nsFieldSetFrame::Reflow(nsPresContext* aPresContext,
return NS_OK;
}
int
nsFieldSetFrame::GetSkipSides() const
{
return 0;
}
NS_IMETHODIMP
nsFieldSetFrame::AppendFrames(ChildListID aListID,
nsFrameList& aFrameList)

6
layout/forms/nsFileControlFrame.cpp
View File

@ -472,12 +472,6 @@ nsFileControlFrame::GetTextControlFrame()
return static_cast<nsTextControlFrame*>(tc);
}
int
nsFileControlFrame::GetSkipSides() const
{
return 0;
}
void
nsFileControlFrame::SyncAttr(int32_t aNameSpaceID, nsIAtom* aAttribute,
int32_t aWhichControls)

2
layout/forms/nsFileControlFrame.h
View File

@ -144,8 +144,6 @@ protected:
~(nsIFrame::eReplaced | nsIFrame::eReplacedContainsBlock));
}
virtual int GetSkipSides() const MOZ_OVERRIDE;
/**
* The text box input.
* @see nsFileControlFrame::CreateAnonymousContent

6
layout/forms/nsHTMLButtonControlFrame.cpp
View File

@ -322,12 +322,6 @@ nsHTMLButtonControlFrame::ReflowButtonContents(nsPresContext* aPresContext,
aDesiredSize.ascent += yoff;
}
int
nsHTMLButtonControlFrame::GetSkipSides() const
{
return 0;
}
nsresult nsHTMLButtonControlFrame::SetFormProperty(nsIAtom* aName, const nsAString& aValue)
{
if (nsGkAtoms::value == aName) {

1
layout/forms/nsHTMLButtonControlFrame.h
View File

@ -109,7 +109,6 @@ protected:
nsMargin aFocusPadding,
nsReflowStatus& aStatus);
int GetSkipSides() const;
nsButtonFrameRenderer mRenderer;
};

7
layout/forms/nsListControlFrame.cpp
View File

@ -1117,13 +1117,6 @@ nsListControlFrame::OnOptionSelected(int32_t aIndex, bool aSelected)
return NS_OK;
}
int
nsListControlFrame::GetSkipSides() const
{
// Don't skip any sides during border rendering
return 0;
}
void
nsListControlFrame::OnContentReset()
{

3
layout/forms/nsListControlFrame.h
View File

@ -109,9 +109,6 @@ public:
virtual mozilla::a11y::AccType AccessibleType() MOZ_OVERRIDE;
#endif
// nsContainerFrame
virtual int GetSkipSides() const MOZ_OVERRIDE;
// nsIListControlFrame
virtual void SetComboboxFrame(nsIFrame* aComboboxFrame);
virtual int32_t GetSelectedIndex() MOZ_OVERRIDE;

6
layout/generic/nsCanvasFrame.cpp
View File

@ -560,12 +560,6 @@ nsCanvasFrame::Reflow(nsPresContext* aPresContext,
return NS_OK;
}
int
nsCanvasFrame::GetSkipSides() const
{
return 0;
}
nsIAtom*
nsCanvasFrame::GetType() const
{

2
layout/generic/nsCanvasFrame.h
View File

@ -109,8 +109,6 @@ public:
nsRect CanvasArea() const;
protected:
virtual int GetSkipSides() const;
// Data members
bool mDoPaintFocus;
bool mAddedScrollPositionListener;

8
layout/generic/nsColumnSetFrame.cpp
View File

@ -84,8 +84,6 @@ protected:
nscoord mLastBalanceHeight;
nsReflowStatus mLastFrameStatus;
virtual int GetSkipSides() const;
/**
* These are the parameters that control the layout of columns.
*/
@ -1105,12 +1103,6 @@ nsColumnSetFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
return NS_OK;
}
int
nsColumnSetFrame::GetSkipSides() const
{
return 0;
}
NS_IMETHODIMP
nsColumnSetFrame::AppendFrames(ChildListID aListID,
nsFrameList& aFrameList)

6
layout/generic/nsFirstLetterFrame.cpp
View File

@ -46,12 +46,6 @@ nsFirstLetterFrame::GetType() const
return nsGkAtoms::letterFrame;
}
int
nsFirstLetterFrame::GetSkipSides() const
{
return 0;
}
NS_IMETHODIMP
nsFirstLetterFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,

2
layout/generic/nsFirstLetterFrame.h
View File

@ -81,8 +81,6 @@ public:
protected:
nscoord mBaseline;
virtual int GetSkipSides() const;
void DrainOverflowFrames(nsPresContext* aPresContext);
};

7
layout/generic/nsFrameSetFrame.cpp
View File

@ -656,13 +656,6 @@ int32_t nsHTMLFramesetFrame::GetBorderWidth(nsPresContext* aPresContext,
return nsPresContext::CSSPixelsToAppUnits(DEFAULT_BORDER_WIDTH_PX);
}
int
nsHTMLFramesetFrame::GetSkipSides() const
{
return 0;
}
void
nsHTMLFramesetFrame::GetDesiredSize(nsPresContext* aPresContext,
const nsHTMLReflowState& aReflowState,

2
layout/generic/nsFrameSetFrame.h
View File

@ -178,8 +178,6 @@ protected:
bool GetNoResize(nsIFrame* aChildFrame);
virtual int GetSkipSides() const;
void ReflowPlaceChild(nsIFrame* aChild,
nsPresContext* aPresContext,
const nsHTMLReflowState& aReflowState,

12
layout/generic/nsGfxScrollFrame.cpp
View File

@ -146,12 +146,6 @@ nsHTMLScrollFrame::GetSplittableType() const
return NS_FRAME_NOT_SPLITTABLE;
}
int
nsHTMLScrollFrame::GetSkipSides() const
{
return 0;
}
nsIAtom*
nsHTMLScrollFrame::GetType() const
{
@ -990,12 +984,6 @@ nsXULScrollFrame::GetPadding(nsMargin& aMargin)
return NS_OK;
}
int
nsXULScrollFrame::GetSkipSides() const
{
return 0;
}
nsIAtom*
nsXULScrollFrame::GetType() const
{

3
layout/generic/nsGfxScrollFrame.h
View File

@ -562,8 +562,6 @@ public:
protected:
nsHTMLScrollFrame(nsIPresShell* aShell, nsStyleContext* aContext, bool aIsRoot);
virtual int GetSkipSides() const;
void SetSuppressScrollbarUpdate(bool aSuppress) {
mInner.mSupppressScrollbarUpdate = aSuppress;
}
@ -817,7 +815,6 @@ public:
protected:
nsXULScrollFrame(nsIPresShell* aShell, nsStyleContext* aContext, bool aIsRoot);
virtual int GetSkipSides() const;
void ClampAndSetBounds(nsBoxLayoutState& aState,
nsRect& aRect,

6
layout/generic/nsSubDocumentFrame.cpp
View File

@ -221,12 +221,6 @@ nsSubDocumentFrame::ShowViewer()
}
}
int
nsSubDocumentFrame::GetSkipSides() const
{
return 0;
}
nsIFrame*
nsSubDocumentFrame::GetSubdocumentRootFrame()
{

2
layout/generic/nsSubDocumentFrame.h
View File

@ -120,8 +120,6 @@ protected:
virtual nscoord GetIntrinsicWidth() MOZ_OVERRIDE;
virtual nscoord GetIntrinsicHeight() MOZ_OVERRIDE;
virtual int GetSkipSides() const;
// Show our document viewer. The document viewer is hidden via a script
// runner, so that we can save and restore the presentation if we're
// being reframed.