Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 00:05:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

# 6071, 15904

Browse Source 
r vidur
d Fixes the problem with comment delimiters.
This commit is contained in:
waqar%netscape.com 1999-11-11 01:28:32 +00:00
parent e9ab7e0c82
commit 84c24cbc5a
2 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
content/base/src/nsGenericDOMDataNode.cpp
View File

@ -313,6 +313,7 @@ nsGenericDOMDataNode::AppendData(const nsString& aData)
{
#if 1
// Allocate new buffer
nsresult result = NS_OK;
PRInt32 dataLength = aData.Length();
PRInt32 textLength = mText.GetLength();
PRInt32 newSize = textLength + dataLength;
@ -330,26 +331,34 @@ nsGenericDOMDataNode::AppendData(const nsString& aData)
nsCRT::memcpy(to + textLength, aData.GetUnicode(),
sizeof(PRUnichar) * dataLength);
nsCOMPtr<nsITextContent> textContent = do_QueryInterface(mContent, &result);
// Switch to new buffer
mText.SetTo(to, newSize);
// Dont do notification in SetText, since we will do it later
if (NS_SUCCEEDED(result)) {
result = textContent->SetText(to, newSize, PR_FALSE);
}
else {
result = SetText(to, newSize, PR_FALSE);
}
delete [] to;
// Trigger a reflow
if (nsnull != mDocument) {
nsTextContentChangeData* tccd = nsnull;
nsresult rv = NS_NewTextContentChangeData(&tccd);
if (NS_SUCCEEDED(rv)) {
result = NS_NewTextContentChangeData(&tccd);
if (NS_SUCCEEDED(result)) {
tccd->SetData(nsITextContentChangeData::Append, textLength, dataLength);
mDocument->ContentChanged(mContent, tccd);
result = mDocument->ContentChanged(mContent, tccd);
NS_RELEASE(tccd);
}
else {
mDocument->ContentChanged(mContent, nsnull);
result = mDocument->ContentChanged(mContent, nsnull);
}
}
return NS_OK;
return result;
#else
return ReplaceData(mText.GetLength(), 0, aData);
#endif

21
layout/base/src/nsGenericDOMDataNode.cpp
View File

@ -313,6 +313,7 @@ nsGenericDOMDataNode::AppendData(const nsString& aData)
{
#if 1
// Allocate new buffer
nsresult result = NS_OK;
PRInt32 dataLength = aData.Length();
PRInt32 textLength = mText.GetLength();
PRInt32 newSize = textLength + dataLength;
@ -330,26 +331,34 @@ nsGenericDOMDataNode::AppendData(const nsString& aData)
nsCRT::memcpy(to + textLength, aData.GetUnicode(),
sizeof(PRUnichar) * dataLength);
nsCOMPtr<nsITextContent> textContent = do_QueryInterface(mContent, &result);
// Switch to new buffer
mText.SetTo(to, newSize);
// Dont do notification in SetText, since we will do it later
if (NS_SUCCEEDED(result)) {
result = textContent->SetText(to, newSize, PR_FALSE);
}
else {
result = SetText(to, newSize, PR_FALSE);
}
delete [] to;
// Trigger a reflow
if (nsnull != mDocument) {
nsTextContentChangeData* tccd = nsnull;
nsresult rv = NS_NewTextContentChangeData(&tccd);
if (NS_SUCCEEDED(rv)) {
result = NS_NewTextContentChangeData(&tccd);
if (NS_SUCCEEDED(result)) {
tccd->SetData(nsITextContentChangeData::Append, textLength, dataLength);
mDocument->ContentChanged(mContent, tccd);
result = mDocument->ContentChanged(mContent, tccd);
NS_RELEASE(tccd);
}
else {
mDocument->ContentChanged(mContent, nsnull);
result = mDocument->ContentChanged(mContent, nsnull);
}
}
return NS_OK;
return result;
#else
return ReplaceData(mText.GetLength(), 0, aData);
#endif