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

Make sure text at the end of the document is reflowed properly

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@7714 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kipp%netscape.com
1998-08-11 00:19:11 +00:00
parent afc7ecd5b1
commit 927fe7a55a
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mozilla/content/html/document/src/nsHTMLContentSink.cpp
View File

@@ -25,6 +25,7 @@
#include "nsIPresContext.h"
#include "nsIViewManager.h"
#include "nsHTMLTokens.h"
#include "nsHTMLEntities.h"
#include "nsCRT.h"
#include "prtime.h"
#include "prlog.h"
@@ -201,7 +202,7 @@ protected:
const nsIParserNode& aNode);
//----------------------------------------------------------------------
void FlushText();
PRBool FlushText();
nsresult AddText(const nsString& aText, nsIHTMLContent** aContent);
@@ -480,11 +481,14 @@ NS_ASSERTION(nsnull == mBody, "yikes");
NS_IMETHODIMP
HTMLContentSink::CloseBody(const nsIParserNode& aNode)
{
FlushText();
SINK_TRACE_NODE(SINK_TRACE_CALLS,
"HTMLContentSink::CloseBody", aNode);
if (FlushText()) {
// Trigger a reflow for the flushed text
mDocument->ContentAppended(mBody);
}
NS_ASSERTION(mStackPos > 0, "bad bad");
mNodeStack[--mStackPos] = eHTMLTag_unknown;
@@ -1489,7 +1493,7 @@ HTMLContentSink::AddText(const nsString& aText, nsIHTMLContent** aContent)
return rv;
}
void
PRBool
HTMLContentSink::FlushText()
{
if (nsnull != mCurrentText) {
@@ -1498,7 +1502,9 @@ HTMLContentSink::FlushText()
mCurrentText->QueryInterface(kIContentIID, (void**) &content);
content->SetDocument(mDocument);
NS_RELEASE(mCurrentText);
return PR_TRUE;
}
return PR_FALSE;
}
void HTMLContentSink::GetAttributeValueAt(const nsIParserNode& aNode,

14
mozilla/layout/html/document/src/nsHTMLContentSink.cpp
View File

@@ -25,6 +25,7 @@
#include "nsIPresContext.h"
#include "nsIViewManager.h"
#include "nsHTMLTokens.h"
#include "nsHTMLEntities.h"
#include "nsCRT.h"
#include "prtime.h"
#include "prlog.h"
@@ -201,7 +202,7 @@ protected:
const nsIParserNode& aNode);
//----------------------------------------------------------------------
void FlushText();
PRBool FlushText();
nsresult AddText(const nsString& aText, nsIHTMLContent** aContent);
@@ -480,11 +481,14 @@ NS_ASSERTION(nsnull == mBody, "yikes");
NS_IMETHODIMP
HTMLContentSink::CloseBody(const nsIParserNode& aNode)
{
FlushText();
SINK_TRACE_NODE(SINK_TRACE_CALLS,
"HTMLContentSink::CloseBody", aNode);
if (FlushText()) {
// Trigger a reflow for the flushed text
mDocument->ContentAppended(mBody);
}
NS_ASSERTION(mStackPos > 0, "bad bad");
mNodeStack[--mStackPos] = eHTMLTag_unknown;
@@ -1489,7 +1493,7 @@ HTMLContentSink::AddText(const nsString& aText, nsIHTMLContent** aContent)
return rv;
}
void
PRBool
HTMLContentSink::FlushText()
{
if (nsnull != mCurrentText) {
@@ -1498,7 +1502,9 @@ HTMLContentSink::FlushText()
mCurrentText->QueryInterface(kIContentIID, (void**) &content);
content->SetDocument(mDocument);
NS_RELEASE(mCurrentText);
return PR_TRUE;
}
return PR_FALSE;
}
void HTMLContentSink::GetAttributeValueAt(const nsIParserNode& aNode,