mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-13 18:27:35 +00:00
Fixed bug 5255 and removed some compiler warnings
This commit is contained in:
parent
5e1f60f6ff
commit
751e2a2073
@ -261,7 +261,7 @@ public:
|
||||
const nsHTMLReflowState& aReflowState,
|
||||
nsReflowStatus& aStatus);
|
||||
NS_IMETHOD AdjustFrameSize(nscoord aExtraSpace, nscoord& aUsedSpace);
|
||||
NS_IMETHOD TrimTrailingWhiteSpace(nsIPresContext& aPresContext,
|
||||
NS_IMETHOD TrimTrailingWhiteSpace(nsIPresContext* aPresContext,
|
||||
nsIRenderingContext& aRC,
|
||||
nscoord& aDeltaWidth);
|
||||
|
||||
@ -2339,9 +2339,9 @@ nsTextFrame::Reflow(nsIPresContext& aPresContext,
|
||||
}
|
||||
else {
|
||||
aReflowState.rendContext->GetWidth(bp, wordLen, width);
|
||||
}
|
||||
if (ts.mLetterSpacing) {
|
||||
width += ts.mLetterSpacing * wordLen;
|
||||
if (ts.mLetterSpacing) {
|
||||
width += ts.mLetterSpacing * wordLen;
|
||||
}
|
||||
}
|
||||
skipWhitespace = PR_FALSE;
|
||||
lastWordWidth = width;
|
||||
@ -2564,7 +2564,7 @@ nsTextFrame::AdjustFrameSize(nscoord aExtraSpace, nscoord& aUsedSpace)
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsTextFrame::TrimTrailingWhiteSpace(nsIPresContext& aPresContext,
|
||||
nsTextFrame::TrimTrailingWhiteSpace(nsIPresContext* aPresContext,
|
||||
nsIRenderingContext& aRC,
|
||||
nscoord& aDeltaWidth)
|
||||
{
|
||||
|
@ -261,7 +261,7 @@ public:
|
||||
const nsHTMLReflowState& aReflowState,
|
||||
nsReflowStatus& aStatus);
|
||||
NS_IMETHOD AdjustFrameSize(nscoord aExtraSpace, nscoord& aUsedSpace);
|
||||
NS_IMETHOD TrimTrailingWhiteSpace(nsIPresContext& aPresContext,
|
||||
NS_IMETHOD TrimTrailingWhiteSpace(nsIPresContext* aPresContext,
|
||||
nsIRenderingContext& aRC,
|
||||
nscoord& aDeltaWidth);
|
||||
|
||||
@ -2339,9 +2339,9 @@ nsTextFrame::Reflow(nsIPresContext& aPresContext,
|
||||
}
|
||||
else {
|
||||
aReflowState.rendContext->GetWidth(bp, wordLen, width);
|
||||
}
|
||||
if (ts.mLetterSpacing) {
|
||||
width += ts.mLetterSpacing * wordLen;
|
||||
if (ts.mLetterSpacing) {
|
||||
width += ts.mLetterSpacing * wordLen;
|
||||
}
|
||||
}
|
||||
skipWhitespace = PR_FALSE;
|
||||
lastWordWidth = width;
|
||||
@ -2564,7 +2564,7 @@ nsTextFrame::AdjustFrameSize(nscoord aExtraSpace, nscoord& aUsedSpace)
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsTextFrame::TrimTrailingWhiteSpace(nsIPresContext& aPresContext,
|
||||
nsTextFrame::TrimTrailingWhiteSpace(nsIPresContext* aPresContext,
|
||||
nsIRenderingContext& aRC,
|
||||
nscoord& aDeltaWidth)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user