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

bug 181644, patch by rick.ju@sun.com, r=bz, sr=roc+moz

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@135580 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jerry.tan%sun.com 2002-12-23 06:01:14 +00:00
parent bc4685bc33
commit 98d4d3661b
2 changed files with 10 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -851,22 +851,12 @@ nsHTMLReflowState::CalculateHypotheticalBox(nsIPresContext* aPresContext,
// space of the block frame that contains it
GetPlaceholderOffset(aPlaceholderFrame, aBlockFrame, placeholderOffset);
// The y-offset is the baseline of where the text would be if it were
// in the flow. We need the top position and not the baseline position
nsIFontMetrics* metrics;
const nsStyleFont* font;
// Use the top of the inline box which the placeholder lives in as the
// hypothetical box's top.
nsPoint offset;
aPlaceholderFrame->GetOrigin(offset);
placeholderOffset.y -= offset.y;
frame->GetStyleData(eStyleStruct_Font, (const nsStyleStruct*&)font);
aPresContext->GetMetricsFor(font->mFont, &metrics);
if (metrics) {
nscoord ascent;
// Adjust the y-offset up by the font ascent. That will translate from
// the baseline to the top of where the text would be
metrics->GetMaxAscent(ascent);
placeholderOffset.y -= ascent;
NS_RELEASE(metrics);
}
aHypotheticalBox.mTop = placeholderOffset.y;
// To determine the left and right offsets we need to look at the block's 'direction'

20
mozilla/layout/html/base/src/nsHTMLReflowState.cpp
View File

@ -851,22 +851,12 @@ nsHTMLReflowState::CalculateHypotheticalBox(nsIPresContext* aPresContext,
// space of the block frame that contains it
GetPlaceholderOffset(aPlaceholderFrame, aBlockFrame, placeholderOffset);
// The y-offset is the baseline of where the text would be if it were
// in the flow. We need the top position and not the baseline position
nsIFontMetrics* metrics;
const nsStyleFont* font;
// Use the top of the inline box which the placeholder lives in as the
// hypothetical box's top.
nsPoint offset;
aPlaceholderFrame->GetOrigin(offset);
placeholderOffset.y -= offset.y;
frame->GetStyleData(eStyleStruct_Font, (const nsStyleStruct*&)font);
aPresContext->GetMetricsFor(font->mFont, &metrics);
if (metrics) {
nscoord ascent;
// Adjust the y-offset up by the font ascent. That will translate from
// the baseline to the top of where the text would be
metrics->GetMaxAscent(ascent);
placeholderOffset.y -= ascent;
NS_RELEASE(metrics);
}
aHypotheticalBox.mTop = placeholderOffset.y;
// To determine the left and right offsets we need to look at the block's 'direction'