Backing out more of 403426. sigh

This commit is contained in:
roc+@cs.cmu.edu 2007-11-30 13:04:24 -08:00
parent 41d0d00457
commit 77814912cc
2 changed files with 3 additions and 20 deletions

View File

@ -184,11 +184,8 @@ public:
* After this call, this linebreaker can be reused.
* This must be called at least once between any call to AppendText() and
* destroying the object.
* @param aTrailingBreak this is set to true when there is a break opportunity
* at the end of the text. This will normally only be declared true when there
* is breakable whitespace at the end.
*/
nsresult Reset(PRBool* aTrailingBreak);
nsresult Reset() { return FlushCurrentWord(); }
private:
// This is a list of text sources that make up the "current word" (i.e.,

View File

@ -391,8 +391,7 @@ nsLineBreaker::AppendText(nsIAtom* aLangGroup, const PRUint8* aText, PRUint32 aL
}
nsresult
nsLineBreaker::AppendInvisibleWhitespace(PRUint32 aFlags)
{
nsLineBreaker::AppendInvisibleWhitespace(PRUint32 aFlags) {
nsresult rv = FlushCurrentWord();
if (NS_FAILED(rv))
return rv;
@ -402,18 +401,5 @@ nsLineBreaker::AppendInvisibleWhitespace(PRUint32 aFlags)
mBreakHere = PR_TRUE;
}
mAfterBreakableSpace = isBreakableSpace;
return NS_OK;
}
nsresult
nsLineBreaker::Reset(PRBool* aTrailingBreak)
{
nsresult rv = FlushCurrentWord();
if (NS_FAILED(rv))
return rv;
*aTrailingBreak = mBreakHere || mAfterBreakableSpace;
mBreakHere = PR_FALSE;
mAfterBreakableSpace = PR_FALSE;
return NS_OK;
return NS_OK;
}