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

Removed compiler warnings; dump more info out in List method

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@29553 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kipp%netscape.com 1999-04-27 22:13:42 +00:00
parent fa896d0275
commit 02ff0b8843
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mozilla/layout/generic/nsTextFrame.cpp
View File

@ -70,8 +70,6 @@ static NS_DEFINE_IID(kIDOMTextIID, NS_IDOMTEXT_IID);
#define WORD_BUF_SIZE 100
#define TEXT_BUF_SIZE 1000
static NS_DEFINE_IID(kITextContentIID, NS_ITEXT_CONTENT_IID);
// Helper class for managing blinking text
class nsBlinkTimer : public nsITimerCallback {
@ -1021,6 +1019,7 @@ nsTextFrame::GetPositionSlowly(nsIPresContext& aPresContext,
glyphWidth = charWidth + ts.mLetterSpacing;
}
else if (ch == ' ') {
nextFont = lastFont;
glyphWidth = ts.mSpaceWidth + ts.mWordSpacing;
nscoord extra = ts.mExtraSpacePerSpace;
if (--ts.mNumSpaces == 0) {
@ -1029,6 +1028,7 @@ nsTextFrame::GetPositionSlowly(nsIPresContext& aPresContext,
glyphWidth += extra;
}
else {
nextFont = lastFont;
aRendContext->GetWidth(ch, charWidth);
glyphWidth = charWidth + ts.mLetterSpacing;
}
@ -2182,6 +2182,15 @@ nsTextFrame::Reflow(nsIPresContext& aPresContext,
// frame. This may happen if, for example, this is text inside a table
// but not inside a cell. For now, just don't reflow.
if (nsnull == aReflowState.lineLayout) {
// XXX Add a method to aMetrics that does this; we do it several places
aMetrics.width = 0;
aMetrics.height = 0;
aMetrics.ascent = 0;
aMetrics.descent = 0;
if (nsnull != aMetrics.maxElementSize) {
aMetrics.maxElementSize->width = 0;
aMetrics.maxElementSize->height = 0;
}
return NS_OK;
}
@ -2887,6 +2896,9 @@ nsTextFrame::List(FILE* out, PRInt32 aIndent) const
isComplete ? 'T':'F',
mFlags);
if (nsnull != mNextSibling) {
fprintf(out, " next=%p", mNextSibling);
}
if (nsnull != mPrevInFlow) {
fprintf(out, "prev-in-flow=%p ", mPrevInFlow);
}
@ -2899,9 +2911,9 @@ nsTextFrame::List(FILE* out, PRInt32 aIndent) const
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fprintf(out, " sc=%p<\n", mStyleContext);
// Output the text
fputs("<\n", out);
aIndent++;
IndentBy(out, aIndent);

18
mozilla/layout/html/base/src/nsTextFrame.cpp
View File

@ -70,8 +70,6 @@ static NS_DEFINE_IID(kIDOMTextIID, NS_IDOMTEXT_IID);
#define WORD_BUF_SIZE 100
#define TEXT_BUF_SIZE 1000
static NS_DEFINE_IID(kITextContentIID, NS_ITEXT_CONTENT_IID);
// Helper class for managing blinking text
class nsBlinkTimer : public nsITimerCallback {
@ -1021,6 +1019,7 @@ nsTextFrame::GetPositionSlowly(nsIPresContext& aPresContext,
glyphWidth = charWidth + ts.mLetterSpacing;
}
else if (ch == ' ') {
nextFont = lastFont;
glyphWidth = ts.mSpaceWidth + ts.mWordSpacing;
nscoord extra = ts.mExtraSpacePerSpace;
if (--ts.mNumSpaces == 0) {
@ -1029,6 +1028,7 @@ nsTextFrame::GetPositionSlowly(nsIPresContext& aPresContext,
glyphWidth += extra;
}
else {
nextFont = lastFont;
aRendContext->GetWidth(ch, charWidth);
glyphWidth = charWidth + ts.mLetterSpacing;
}
@ -2182,6 +2182,15 @@ nsTextFrame::Reflow(nsIPresContext& aPresContext,
// frame. This may happen if, for example, this is text inside a table
// but not inside a cell. For now, just don't reflow.
if (nsnull == aReflowState.lineLayout) {
// XXX Add a method to aMetrics that does this; we do it several places
aMetrics.width = 0;
aMetrics.height = 0;
aMetrics.ascent = 0;
aMetrics.descent = 0;
if (nsnull != aMetrics.maxElementSize) {
aMetrics.maxElementSize->width = 0;
aMetrics.maxElementSize->height = 0;
}
return NS_OK;
}
@ -2887,6 +2896,9 @@ nsTextFrame::List(FILE* out, PRInt32 aIndent) const
isComplete ? 'T':'F',
mFlags);
if (nsnull != mNextSibling) {
fprintf(out, " next=%p", mNextSibling);
}
if (nsnull != mPrevInFlow) {
fprintf(out, "prev-in-flow=%p ", mPrevInFlow);
}
@ -2899,9 +2911,9 @@ nsTextFrame::List(FILE* out, PRInt32 aIndent) const
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fprintf(out, " sc=%p<\n", mStyleContext);
// Output the text
fputs("<\n", out);
aIndent++;
IndentBy(out, aIndent);