mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

a=chofmann. r=nisheeth, hyatt. Revised fix for bug 24442 and 24524. Switched 

reference count handling for the content stack to use nsISupports. The previous
check introduced a leak.
This commit is contained in:
vidur%netscape.com 2000-01-21 01:32:32 +00:00
Родитель c89b22c331
Коммит 7be4e353c8
4 изменённых файлов: 50 добавлений и 54 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

49
content/xml/document/src/nsXMLContentSink.cpp
Просмотреть файл

@ -192,15 +192,6 @@ nsXMLContentSink::~nsXMLContentSink()
NS_IF_RELEASE(mParser);
NS_IF_RELEASE(mRootElement);
NS_IF_RELEASE(mDocElement);
if (nsnull != mContentStack) {
// there shouldn't be anything here except in an error condition
PRInt32 index = mContentStack->Count();
while (0 < index--) {
nsIContent* content = (nsIContent*)mContentStack->ElementAt(index);
NS_RELEASE(content);
}
delete mContentStack;
}
if (nsnull != mNameSpaceStack) {
// There shouldn't be any here except in an error condition
PRInt32 index = mNameSpaceStack->Count();
@ -761,7 +752,7 @@ nsXMLContentSink::OpenContainer(const nsIParserNode& aNode)
#endif
}
else {
nsIContent *parent = GetCurrentContent();
nsCOMPtr<nsIContent> parent = getter_AddRefs(GetCurrentContent());
parent->AppendChildTo(content, PR_FALSE);
}
@ -806,10 +797,10 @@ nsXMLContentSink::CloseContainer(const nsIParserNode& aNode)
NS_RELEASE(tagAtom);
}
nsIContent* content = nsnull;
nsCOMPtr<nsIContent> content;
if (popContent) {
content = PopContent();
if (nsnull != content) {
content = getter_AddRefs(PopContent());
if (content) {
if (mDocElement == content) {
mState = eXMLContentSinkState_InEpilog;
}
@ -821,12 +812,10 @@ nsXMLContentSink::CloseContainer(const nsIParserNode& aNode)
}
}
nsINameSpace* nameSpace = PopNameSpaces();
if (nsnull != content) {
nsIXMLContent* xmlContent;
if (NS_OK == content->QueryInterface(kIXMLContentIID,
(void **)&xmlContent)) {
if (content) {
nsCOMPtr<nsIXMLContent> xmlContent = do_QueryInterface(content);
if (xmlContent) {
xmlContent->SetContainingNameSpace(nameSpace);
NS_RELEASE(xmlContent);
}
}
NS_IF_RELEASE(nameSpace);
@ -1016,7 +1005,7 @@ nsXMLContentSink::AddContentAsLeaf(nsIContent *aContent)
result = mDocument->AppendToEpilog(aContent);
}
else {
nsIContent *parent = GetCurrentContent();
nsCOMPtr<nsIContent> parent = getter_AddRefs(GetCurrentContent());
if (nsnull != parent) {
result = parent->AppendChildTo(aContent, PR_FALSE);
@ -1527,8 +1516,12 @@ nsIContent*
nsXMLContentSink::GetCurrentContent()
{
if (nsnull != mContentStack) {
PRInt32 index = mContentStack->Count() - 1;
return (nsIContent *)mContentStack->ElementAt(index);
PRUint32 count;
mContentStack->Count(&count);
PR_ASSERT(count);
if (count) {
return (nsIContent *)mContentStack->ElementAt(count-1);
}
}
return nsnull;
}
@ -1536,13 +1529,15 @@ nsXMLContentSink::GetCurrentContent()
PRInt32
nsXMLContentSink::PushContent(nsIContent *aContent)
{
PRUint32 count;
if (nsnull == mContentStack) {
mContentStack = new nsVoidArray();
NS_NewISupportsArray(getter_AddRefs(mContentStack));
}
NS_IF_ADDREF(aContent);
mContentStack->AppendElement((void *)aContent);
return mContentStack->Count();
mContentStack->AppendElement(aContent);
mContentStack->Count(&count);
return count;
}
nsIContent*
@ -1550,7 +1545,9 @@ nsXMLContentSink::PopContent()
{
nsIContent* content = nsnull;
if (nsnull != mContentStack) {
PRInt32 index = mContentStack->Count() - 1;
PRUint32 index, count;
mContentStack->Count(&count);
index = count - 1;
content = (nsIContent *)mContentStack->ElementAt(index);
mContentStack->RemoveElementAt(index);
}

3
content/xml/document/src/nsXMLContentSink.h
Просмотреть файл

@ -33,6 +33,7 @@
#endif
#include "nsIUnicharInputStream.h"
#include "nsIUnicharStreamLoader.h"
#include "nsISupportsArray.h"
class nsIDocument;
class nsIScriptObjectOwner;
@ -175,7 +176,7 @@ protected:
nsIContent* mDocElement;
XMLContentSinkState mState;
nsVoidArray* mContentStack;
nsCOMPtr<nsISupportsArray> mContentStack;
nsVoidArray* mNameSpaceStack;
nsScrollPreference mOriginalScrollPreference;

49
layout/xml/document/src/nsXMLContentSink.cpp
Просмотреть файл

@ -192,15 +192,6 @@ nsXMLContentSink::~nsXMLContentSink()
NS_IF_RELEASE(mParser);
NS_IF_RELEASE(mRootElement);
NS_IF_RELEASE(mDocElement);
if (nsnull != mContentStack) {
// there shouldn't be anything here except in an error condition
PRInt32 index = mContentStack->Count();
while (0 < index--) {
nsIContent* content = (nsIContent*)mContentStack->ElementAt(index);
NS_RELEASE(content);
}
delete mContentStack;
}
if (nsnull != mNameSpaceStack) {
// There shouldn't be any here except in an error condition
PRInt32 index = mNameSpaceStack->Count();
@ -761,7 +752,7 @@ nsXMLContentSink::OpenContainer(const nsIParserNode& aNode)
#endif
}
else {
nsIContent *parent = GetCurrentContent();
nsCOMPtr<nsIContent> parent = getter_AddRefs(GetCurrentContent());
parent->AppendChildTo(content, PR_FALSE);
}
@ -806,10 +797,10 @@ nsXMLContentSink::CloseContainer(const nsIParserNode& aNode)
NS_RELEASE(tagAtom);
}
nsIContent* content = nsnull;
nsCOMPtr<nsIContent> content;
if (popContent) {
content = PopContent();
if (nsnull != content) {
content = getter_AddRefs(PopContent());
if (content) {
if (mDocElement == content) {
mState = eXMLContentSinkState_InEpilog;
}
@ -821,12 +812,10 @@ nsXMLContentSink::CloseContainer(const nsIParserNode& aNode)
}
}
nsINameSpace* nameSpace = PopNameSpaces();
if (nsnull != content) {
nsIXMLContent* xmlContent;
if (NS_OK == content->QueryInterface(kIXMLContentIID,
(void **)&xmlContent)) {
if (content) {
nsCOMPtr<nsIXMLContent> xmlContent = do_QueryInterface(content);
if (xmlContent) {
xmlContent->SetContainingNameSpace(nameSpace);
NS_RELEASE(xmlContent);
}
}
NS_IF_RELEASE(nameSpace);
@ -1016,7 +1005,7 @@ nsXMLContentSink::AddContentAsLeaf(nsIContent *aContent)
result = mDocument->AppendToEpilog(aContent);
}
else {
nsIContent *parent = GetCurrentContent();
nsCOMPtr<nsIContent> parent = getter_AddRefs(GetCurrentContent());
if (nsnull != parent) {
result = parent->AppendChildTo(aContent, PR_FALSE);
@ -1527,8 +1516,12 @@ nsIContent*
nsXMLContentSink::GetCurrentContent()
{
if (nsnull != mContentStack) {
PRInt32 index = mContentStack->Count() - 1;
return (nsIContent *)mContentStack->ElementAt(index);
PRUint32 count;
mContentStack->Count(&count);
PR_ASSERT(count);
if (count) {
return (nsIContent *)mContentStack->ElementAt(count-1);
}
}
return nsnull;
}
@ -1536,13 +1529,15 @@ nsXMLContentSink::GetCurrentContent()
PRInt32
nsXMLContentSink::PushContent(nsIContent *aContent)
{
PRUint32 count;
if (nsnull == mContentStack) {
mContentStack = new nsVoidArray();
NS_NewISupportsArray(getter_AddRefs(mContentStack));
}
NS_IF_ADDREF(aContent);
mContentStack->AppendElement((void *)aContent);
return mContentStack->Count();
mContentStack->AppendElement(aContent);
mContentStack->Count(&count);
return count;
}
nsIContent*
@ -1550,7 +1545,9 @@ nsXMLContentSink::PopContent()
{
nsIContent* content = nsnull;
if (nsnull != mContentStack) {
PRInt32 index = mContentStack->Count() - 1;
PRUint32 index, count;
mContentStack->Count(&count);
index = count - 1;
content = (nsIContent *)mContentStack->ElementAt(index);
mContentStack->RemoveElementAt(index);
}

3
layout/xml/document/src/nsXMLContentSink.h
Просмотреть файл

@ -33,6 +33,7 @@
#endif
#include "nsIUnicharInputStream.h"
#include "nsIUnicharStreamLoader.h"
#include "nsISupportsArray.h"
class nsIDocument;
class nsIScriptObjectOwner;
@ -175,7 +176,7 @@ protected:
nsIContent* mDocElement;
XMLContentSinkState mState;
nsVoidArray* mContentStack;
nsCOMPtr<nsISupportsArray> mContentStack;
nsVoidArray* mNameSpaceStack;
nsScrollPreference mOriginalScrollPreference;