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

Replace PR_MIN/PR_MAX with NS_MIN/NS_MAX. b=512106 r=roc

Browse Source
This commit is contained in:
Mats Palmgren
2009-09-16 17:01:36 +02:00
parent 3ae7f7036a
commit f82eedba5a
81 changed files with 514 additions and 508 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
layout/forms/nsHTMLButtonControlFrame.cpp
View File

@@ -319,12 +319,12 @@ nsHTMLButtonControlFrame::ReflowButtonContents(nsPresContext* aPresContext,
NS_ASSERTION(extraright >=0, "How'd that happen?");
// Do not allow the extras to be bigger than the relevant padding
extraleft = PR_MIN(extraleft, aReflowState.mComputedPadding.left);
extraright = PR_MIN(extraright, aReflowState.mComputedPadding.right);
extraleft = NS_MIN(extraleft, aReflowState.mComputedPadding.left);
extraright = NS_MIN(extraright, aReflowState.mComputedPadding.right);
xoffset -= extraleft;
availSize.width += extraleft + extraright;
}
availSize.width = PR_MAX(availSize.width,0);
availSize.width = NS_MAX(availSize.width,0);
nsHTMLReflowState reflowState(aPresContext, aReflowState, aFirstKid,
availSize);
@@ -338,7 +338,7 @@ nsHTMLButtonControlFrame::ReflowButtonContents(nsPresContext* aPresContext,
// XXXbz this assumes border-box sizing.
nscoord minInternalHeight = aReflowState.mComputedMinHeight -
aReflowState.mComputedBorderPadding.TopBottom();
minInternalHeight = PR_MAX(minInternalHeight, 0);
minInternalHeight = NS_MAX(minInternalHeight, 0);
// center child vertically
nscoord yoff = 0;