wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 468562 - "ASSERTION: Inserting multiple children without flushing"; r+sr=mrbkap

Browse Source
This commit is contained in:
Ben Newman 2008-12-20 01:49:08 +01:00
parent c80ee6de74
commit 5a5c94ecb3
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
content/html/document/src/nsHTMLContentSink.cpp
View File

@ -334,7 +334,7 @@ public:
nsresult OpenContainer(const nsIParserNode& aNode);
nsresult CloseContainer(const nsHTMLTag aTag, PRBool aMalformed);
nsresult AddLeaf(const nsIParserNode& aNode);
nsresult AddLeaf(nsGenericHTMLElement* aContent);
nsresult AddLeaf(nsIContent* aContent);
nsresult AddComment(const nsIParserNode& aNode);
nsresult End();
@ -898,6 +898,7 @@ SinkContext::HaveNotifiedForCurrentContent() const
nsIContent *
SinkContext::Node::Add(nsIContent *child)
{
NS_ASSERTION(mContent, "No parent to insert/append into!");
if (mInsertionPoint != -1) {
NS_ASSERTION(mNumFlushed == mContent->GetChildCount(),
"Inserting multiple children without flushing.");
@ -1153,7 +1154,7 @@ SinkContext::AddLeaf(const nsIParserNode& aNode)
}
nsresult
SinkContext::AddLeaf(nsGenericHTMLElement* aContent)
SinkContext::AddLeaf(nsIContent* aContent)
{
NS_ASSERTION(mStackPos > 0, "leaf w/o container");
if (mStackPos <= 0) {
@ -1470,13 +1471,8 @@ SinkContext::FlushText(PRBool* aDidFlush, PRBool aReleaseLast)
mLastTextNodeSize += mTextLength;
mTextLength = 0;
// Add text to its parent
NS_ASSERTION(mStackPos > 0, "leaf w/o container");
if (mStackPos <= 0) {
return NS_ERROR_FAILURE;
}
DidAddContent(mStack[mStackPos - 1].Add(mLastTextNode));
rv = AddLeaf(mLastTextNode);
NS_ENSURE_SUCCESS(rv, rv);
didFlush = PR_TRUE;
}
@ -2889,13 +2885,8 @@ nsresult
HTMLContentSink::ProcessLINKTag(const nsIParserNode& aNode)
{
nsresult result = NS_OK;
nsGenericHTMLElement* parent = nsnull;
if (mCurrentContext) {
parent = mCurrentContext->mStack[mCurrentContext->mStackPos - 1].mContent;
}
if (parent) {
// Create content object
nsCOMPtr<nsIContent> element;
nsCOMPtr<nsINodeInfo> nodeInfo;
@ -2923,7 +2914,8 @@ HTMLContentSink::ProcessLINKTag(const nsIParserNode& aNode)
if (NS_FAILED(result)) {
return result;
}
parent->AppendChildTo(element, PR_FALSE);
mCurrentContext->AddLeaf(element); // <link>s are leaves
if (ssle) {
ssle->SetEnableUpdates(PR_TRUE);