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

Bug 174055, part 4: mechanical fixups outside gfx.

Browse Source
This commit is contained in:
Zack Weinberg
2011-04-07 18:05:49 -07:00
parent 5a561b633c
commit 2da91ac5cb
46 changed files with 101 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
layout/generic/nsHTMLReflowState.cpp
View File

@@ -47,7 +47,7 @@
#include "nsPresContext.h"
#include "nsIPresShell.h"
#include "nsIDeviceContext.h"
#include "nsIFontMetrics.h"
#include "nsFontMetrics.h"
#include "nsBlockFrame.h"
#include "nsLineBox.h"
#include "nsImageFrame.h"
@@ -2106,7 +2106,7 @@ nsHTMLReflowState::CalculateBlockSideMargins(nscoord aAvailWidth,
// For risk management, we use preference to control the behavior, and
// eNoExternalLeading is the old behavior.
static nscoord
GetNormalLineHeight(nsIFontMetrics* aFontMetrics)
GetNormalLineHeight(nsFontMetrics* aFontMetrics)
{
NS_PRECONDITION(nsnull != aFontMetrics, "no font metrics");
@@ -2160,7 +2160,7 @@ ComputeLineHeight(nsStyleContext* aStyleContext,
return aBlockHeight;
}
nsCOMPtr<nsIFontMetrics> fm;
nsRefPtr<nsFontMetrics> fm;
nsLayoutUtils::GetFontMetricsForStyleContext(aStyleContext,
getter_AddRefs(fm));
return GetNormalLineHeight(fm);