Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove nsIStyleContext (bug 114713), r/sr=dbaron. Changed lots of methods to use nsStyleContext* or already_AddRefed<nsStyleContext> as return values, depending on whether a reference is returned. Turn on nsRefPtr (bug 104346), and change nsDerivedSafe to not declare AddRef and Release explicitly virtual, r=jag, sr=dbaron.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@138129 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bryner%netscape.com
2003-02-22 00:32:13 +00:00
parent a1fd6aa5e3
commit c44337949a
311 changed files with 3728 additions and 4482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mozilla/layout/generic/nsHTMLReflowState.cpp
View File

@@ -621,8 +621,7 @@ GetNearestContainingBlock(nsIFrame* aFrame, nsMargin& aContentArea)
// it's percentage based (for example) then just ignore it
nsStyleBorderPadding bPad;
nsMargin borderPadding;
nsCOMPtr<nsIStyleContext> styleContext;
aFrame->GetStyleContext(getter_AddRefs(styleContext));
nsStyleContext* styleContext = aFrame->GetStyleContext();
styleContext->GetBorderPaddingFor(bPad);
if (bPad.GetBorderPadding(borderPadding)) {
aContentArea.left += borderPadding.left;
@@ -2317,7 +2316,7 @@ GetNormalLineHeight(nsIFontMetrics* aFontMetrics)
static nscoord
ComputeLineHeight(nsIPresContext* aPresContext,
nsIRenderingContext* aRenderingContext,
nsIStyleContext* aStyleContext)
nsStyleContext* aStyleContext)
{
NS_PRECONDITION(nsnull != aRenderingContext, "no rendering context");
@@ -2377,8 +2376,7 @@ nsHTMLReflowState::CalcLineHeight(nsIPresContext* aPresContext,
nsIFrame* aFrame)
{
nscoord lineHeight = -1;
nsCOMPtr<nsIStyleContext> sc;
aFrame->GetStyleContext(getter_AddRefs(sc));
nsStyleContext* sc = aFrame->GetStyleContext();
if (sc) {
lineHeight = ComputeLineHeight(aPresContext, aRenderingContext, sc);
}
@@ -2427,8 +2425,7 @@ nsHTMLReflowState::ComputeHorizontalValue(nscoord aContainingBlockWidth,
// pretend its zero...
}
else {
nsCOMPtr<nsIStyleContext> styleContext;
frame->GetStyleContext(getter_AddRefs(styleContext));
nsStyleContext* styleContext = frame->GetStyleContext();
SetFontFromStyle(rendContext, styleContext);
nscoord fontWidth;
rendContext->GetWidth('M', fontWidth);