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

Clean up API (and its callers) for getting style data: remove unneeded null checks and switch to new inline member functions (one for each struct) that return values. b=197205 r+sr=roc a=brendan

Browse Source
This commit is contained in:
dbaron@dbaron.org
2003-05-15 03:42:21 +00:00
parent ea1bb25c8e
commit f98e358469
188 changed files with 1600 additions and 3137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
layout/forms/nsHTMLButtonControlFrame.cpp
View File

@@ -129,9 +129,7 @@ nsHTMLButtonControlFrame::Init(nsIPresContext* aPresContext,
nsresult rv = nsHTMLContainerFrame::Init(aPresContext, aContent, aParent, aContext, aPrevInFlow);
mRenderer.SetFrame(this,aPresContext);
// cache our display type
const nsStyleDisplay* styleDisplay;
GetStyleData(eStyleStruct_Display, (const nsStyleStruct*&) styleDisplay);
mInline = (NS_STYLE_DISPLAY_BLOCK != styleDisplay->mDisplay);
mInline = (NS_STYLE_DISPLAY_BLOCK != GetStyleDisplay()->mDisplay);
PRUint32 flags = NS_BLOCK_SPACE_MGR;
if (mInline) {
@@ -309,10 +307,7 @@ nsHTMLButtonControlFrame::GetFrameForPoint(nsIPresContext* aPresContext,
{
if (aWhichLayer == NS_FRAME_PAINT_LAYER_FOREGROUND &&
mRect.Contains(aPoint)) {
const nsStyleVisibility* vis =
(const nsStyleVisibility*)mStyleContext->GetStyleData(eStyleStruct_Visibility);
if (vis->IsVisible()) {
if (GetStyleVisibility()->IsVisible()) {
*aFrame = this;
return NS_OK;
}
@@ -380,8 +375,7 @@ nsHTMLButtonControlFrame::Paint(nsIPresContext* aPresContext,
// but the real problem is the FirstChild (the AreaFrame)
// isn't being constrained properly
// Bug #17474
const nsStyleBorder* borderStyle;
GetStyleData(eStyleStruct_Border, (const nsStyleStruct *&)borderStyle);
const nsStyleBorder* borderStyle = GetStyleBorder();
nsMargin border;
border.SizeTo(0, 0, 0, 0);
borderStyle->CalcBorderFor(this, border);
@@ -465,9 +459,8 @@ nsHTMLButtonControlFrame::Reflow(nsIPresContext* aPresContext,
viewMan->InsertChild(parView, view, 0);
SetView(view);
const nsStyleColor* color = (const nsStyleColor*) mStyleContext->GetStyleData(eStyleStruct_Color);
// set the opacity
viewMan->SetViewOpacity(view, color->mOpacity);
viewMan->SetViewOpacity(view, GetStyleColor()->mOpacity);
}
mDidInit = PR_TRUE;