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

Fixed AddRef/Release problems to eliminate negative refcounts in Bloaty.

This commit is contained in:
warren%netscape.com 1999-10-08 01:49:06 +00:00
Родитель 5be7e1c635
Коммит 8c71c45537
152 изменённых файлов: 346 добавлений и 615 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

16
content/base/src/nsStyleContext.cpp
Просмотреть файл

@ -1470,14 +1470,18 @@ nsrefcnt StyleContextImpl::AddRef(void)
{
NS_PRECONDITION(PRInt32(mRefCnt) >= 0, "illegal refcnt");
__log_addref((void*) this, mRefCnt, mRefCnt + 1);
return ++mRefCnt;
++mRefCnt;
NS_LOG_ADDREF(this, mRefCnt, "StyleContextImpl");
return mRefCnt;
}
nsrefcnt StyleContextImpl::Release(void)
{
NS_PRECONDITION(0 != mRefCnt, "dup release");
__log_release((void*) this, mRefCnt, mRefCnt - 1);
if (--mRefCnt == 0) {
--mRefCnt;
NS_LOG_RELEASE(this, mRefCnt, "StyleContextImpl");
if (mRefCnt == 0) {
NS_DELETEXPCOM(this);
return 0;
}
@ -1493,7 +1497,9 @@ nsrefcnt StyleContextImpl::AddRef(void)
if ((gInstrument == -1) || (mInstance == gInstrument)) {
fprintf(stdout, "%d AddRef StyleContext %d\n", mRefCnt + 1, mInstance);
}
return ++mRefCnt;
++mRefCnt;
NS_LOG_ADDREF(this, mRefCnt, "StyleContextImpl");
return mRefCnt;
}
nsrefcnt StyleContextImpl::Release(void)
@ -1501,7 +1507,9 @@ nsrefcnt StyleContextImpl::Release(void)
if ((gInstrument == -1) || (mInstance == gInstrument)) {
fprintf(stdout, "%d Release StyleContext %d\n", mRefCnt - 1, mInstance);
}
if (--mRefCnt == 0) {
--mRefCnt;
NS_LOG_RELEASE(this, mRefCnt, "StyleContextImpl");
if (mRefCnt == 0) {
delete this;
return 0;
}

2
content/html/content/src/nsHTMLAnchorElement.cpp
Просмотреть файл

@ -151,7 +151,7 @@ nsHTMLAnchorElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLAnchorElementIID)) {
nsIDOMHTMLAnchorElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
else if (aIID.Equals(kIFocusableContentIID)) {

2
content/html/content/src/nsHTMLAppletElement.cpp
Просмотреть файл

@ -151,7 +151,7 @@ nsHTMLAppletElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLAppletElementIID)) {
nsIDOMHTMLAppletElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

2
content/html/content/src/nsHTMLBodyElement.cpp
Просмотреть файл

@ -595,7 +595,7 @@ nsHTMLBodyElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLBodyElementIID)) {
nsIDOMHTMLBodyElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

7
content/html/content/src/nsHTMLButtonElement.cpp
Просмотреть файл

@ -155,7 +155,9 @@ nsHTMLButtonElement::~nsHTMLButtonElement()
NS_IMETHODIMP_(nsrefcnt)
nsHTMLButtonElement::AddRef(void)
{
return ++mRefCnt;
++mRefCnt;
NS_LOG_ADDREF(this, mRefCnt, "nsHTMLButtonElement");
return mRefCnt;
}
nsresult
@ -164,7 +166,7 @@ nsHTMLButtonElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
NS_IMPL_HTML_CONTENT_QUERY_INTERFACE(aIID, aInstancePtr, this)
if (aIID.Equals(kIDOMHTMLButtonElementIID)) {
*aInstancePtr = (void*)(nsIDOMHTMLButtonElement*)this;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
else if (aIID.Equals(kIFormControlIID)) {
@ -184,6 +186,7 @@ NS_IMETHODIMP_(nsrefcnt)
nsHTMLButtonElement::Release()
{
--mRefCnt;
NS_LOG_RELEASE(this, mRefCnt, "nsHTMLButtonElement");
if (mRefCnt <= 0) {
delete this;
return 0;

2
content/html/content/src/nsHTMLDListElement.cpp
Просмотреть файл

@ -110,7 +110,7 @@ nsHTMLDListElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLDListElementIID)) {
nsIDOMHTMLDListElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

2
content/html/content/src/nsHTMLDelElement.cpp
Просмотреть файл

@ -111,7 +111,7 @@ nsHTMLDelElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLModElementIID)) {
nsIDOMHTMLModElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

2
content/html/content/src/nsHTMLDirectoryElement.cpp
Просмотреть файл

@ -114,7 +114,7 @@ nsHTMLDirectoryElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLDirectoryElementIID)) {
nsIDOMHTMLDirectoryElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

2
content/html/content/src/nsHTMLDivElement.cpp
Просмотреть файл

@ -112,7 +112,7 @@ nsHTMLDivElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLDivElementIID)) {
nsIDOMHTMLDivElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

2
content/html/content/src/nsHTMLEmbedElement.cpp
Просмотреть файл

@ -110,7 +110,7 @@ nsHTMLEmbedElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLEmbedElementIID)) {
nsIDOMHTMLEmbedElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
#endif

4
content/html/content/src/nsHTMLFieldSetElement.cpp
Просмотреть файл

@ -145,12 +145,12 @@ nsHTMLFieldSetElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
NS_IMPL_HTML_CONTENT_QUERY_INTERFACE(aIID, aInstancePtr, this)
if (aIID.Equals(kIDOMHTMLFieldSetElementIID)) {
*aInstancePtr = (void*)(nsIDOMHTMLFieldSetElement*)this;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
else if (aIID.Equals(kIFormControlIID)) {
*aInstancePtr = (void*)(nsIFormControl*)this;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

2
content/html/content/src/nsHTMLFontElement.cpp
Просмотреть файл

@ -117,7 +117,7 @@ nsHTMLFontElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLFontElementIID)) {
nsIDOMHTMLFontElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

5
content/html/content/src/nsHTMLFormElement.cpp
Просмотреть файл

@ -243,7 +243,9 @@ NS_IMETHODIMP_(nsrefcnt)
nsHTMLFormElement::AddRef(void)
{
//nsTraceRefcnt::AddRef((nsIForm*)this, mRefCnt+1, __FILE__, __LINE__);
return ++mRefCnt;
++mRefCnt;
NS_LOG_ADDREF(this, mRefCnt, "nsHTMLFormElement");
return mRefCnt;
}
NS_IMETHODIMP_(nsrefcnt)
@ -251,6 +253,7 @@ nsHTMLFormElement::Release()
{
//nsTraceRefcnt::Release((nsIForm*)this, mRefCnt-1, __FILE__, __LINE__);
--mRefCnt;
NS_LOG_RELEASE(this, mRefCnt, "nsHTMLFormElement");
PRUint32 numChildren;
GetElementCount(&numChildren);
if (mRefCnt == nsrefcnt(numChildren)) {

2
content/html/content/src/nsHTMLFrameElement.cpp
Просмотреть файл

@ -123,7 +123,7 @@ nsHTMLFrameElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLFrameElementIID)) {
nsIDOMHTMLFrameElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

2
content/html/content/src/nsHTMLFrameSetElement.cpp
Просмотреть файл

@ -111,7 +111,7 @@ nsHTMLFrameSetElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLFrameSetElementIID)) {
nsIDOMHTMLFrameSetElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

2
content/html/content/src/nsHTMLHeadingElement.cpp
Просмотреть файл

@ -110,7 +110,7 @@ nsHTMLHeadingElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLHeadingElementIID)) {
nsIDOMHTMLHeadingElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

2
content/html/content/src/nsHTMLHtmlElement.cpp
Просмотреть файл

@ -113,7 +113,7 @@ nsHTMLHtmlElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLHtmlElementIID)) {
nsIDOMHTMLHtmlElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

2
content/html/content/src/nsHTMLIFrameElement.cpp
Просмотреть файл

@ -135,7 +135,7 @@ nsHTMLIFrameElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLIFrameElementIID)) {
nsIDOMHTMLIFrameElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

2
content/html/content/src/nsHTMLImageElement.cpp
Просмотреть файл

@ -183,7 +183,7 @@ nsHTMLImageElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLImageElementIID)) {
nsIDOMHTMLImageElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
if (aIID.Equals(kIJSNativeInitializerIID)) {

5
content/html/content/src/nsHTMLInputElement.cpp
Просмотреть файл

@ -190,7 +190,9 @@ nsHTMLInputElement::~nsHTMLInputElement()
NS_IMETHODIMP_(nsrefcnt)
nsHTMLInputElement::AddRef(void)
{
return ++mRefCnt;
++mRefCnt;
NS_LOG_ADDREF(this, mRefCnt, "nsHTMLInputElement");
return mRefCnt;
}
@ -220,6 +222,7 @@ NS_IMETHODIMP_(nsrefcnt)
nsHTMLInputElement::Release()
{
--mRefCnt;
NS_LOG_RELEASE(this, mRefCnt, "nsHTMLInputElement");
if (mRefCnt <= 0) {
delete this;
return 0;

2
content/html/content/src/nsHTMLInsElement.cpp
Просмотреть файл

@ -111,7 +111,7 @@ nsHTMLInsElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLModElementIID)) {
nsIDOMHTMLModElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

2
content/html/content/src/nsHTMLIsIndexElement.cpp
Просмотреть файл

@ -110,7 +110,7 @@ nsHTMLIsIndexElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLIsIndexElementIID)) {
nsIDOMHTMLIsIndexElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

2
content/html/content/src/nsHTMLLIElement.cpp
Просмотреть файл

@ -112,7 +112,7 @@ nsHTMLLIElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLLIElementIID)) {
nsIDOMHTMLLIElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

2
content/html/content/src/nsHTMLLegendElement.cpp
Просмотреть файл

@ -122,7 +122,7 @@ nsHTMLLegendElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLLegendElementIID)) {
nsIDOMHTMLLegendElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

2
content/html/content/src/nsHTMLMapElement.cpp
Просмотреть файл

@ -229,7 +229,7 @@ nsHTMLMapElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLMapElementIID)) {
nsIDOMHTMLMapElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

2
content/html/content/src/nsHTMLMenuElement.cpp
Просмотреть файл

@ -114,7 +114,7 @@ nsHTMLMenuElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLMenuElementIID)) {
nsIDOMHTMLMenuElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

2
content/html/content/src/nsHTMLModElement.cpp
Просмотреть файл

@ -111,7 +111,7 @@ nsHTMLModElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLModElementIID)) {
nsIDOMHTMLModElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

2
content/html/content/src/nsHTMLOListElement.cpp
Просмотреть файл

@ -114,7 +114,7 @@ nsHTMLOListElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLOListElementIID)) {
nsIDOMHTMLOListElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

2
content/html/content/src/nsHTMLObjectElement.cpp
Просмотреть файл

@ -142,7 +142,7 @@ nsHTMLObjectElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLObjectElementIID)) {
nsIDOMHTMLObjectElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

2
content/html/content/src/nsHTMLOptGroupElement.cpp
Просмотреть файл

@ -111,7 +111,7 @@ nsHTMLOptGroupElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLOptGroupElementIID)) {
nsIDOMHTMLOptGroupElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

2
content/html/content/src/nsHTMLOptionElement.cpp
Просмотреть файл

@ -160,7 +160,7 @@ nsHTMLOptionElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
NS_IMPL_HTML_CONTENT_QUERY_INTERFACE(aIID, aInstancePtr, this)
if (aIID.Equals(kIDOMHTMLOptionElementIID)) {
*aInstancePtr = (void*)(nsIDOMHTMLOptionElement*) this;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
if (aIID.Equals(kIJSNativeInitializerIID)) {

2
content/html/content/src/nsHTMLParagraphElement.cpp
Просмотреть файл

@ -115,7 +115,7 @@ nsHTMLParagraphElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLParagraphElementIID)) {
nsIDOMHTMLParagraphElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

2
content/html/content/src/nsHTMLPreElement.cpp
Просмотреть файл

@ -112,7 +112,7 @@ nsHTMLPreElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLPreElementIID)) {
nsIDOMHTMLPreElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

2
content/html/content/src/nsHTMLQuoteElement.cpp
Просмотреть файл

@ -109,7 +109,7 @@ nsHTMLQuoteElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLQuoteElementIID)) {
nsIDOMHTMLQuoteElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

6
content/html/content/src/nsHTMLSelectElement.cpp
Просмотреть файл

@ -239,17 +239,17 @@ nsHTMLSelectElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
NS_IMPL_HTML_CONTENT_QUERY_INTERFACE(aIID, aInstancePtr, this)
if (aIID.Equals(kIDOMHTMLSelectElementIID)) {
*aInstancePtr = (void*)(nsIDOMHTMLSelectElement*)this;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
else if (aIID.Equals(kIDOMNSHTMLSelectElementIID)) {
*aInstancePtr = (void*)(nsIDOMNSHTMLSelectElement*)this;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
else if (aIID.Equals(kIFormControlIID)) {
*aInstancePtr = (void*)(nsIFormControl*)this;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
else if (aIID.Equals(kIFocusableContentIID)) {

2
content/html/content/src/nsHTMLSharedObjectElement.cpp
Просмотреть файл

@ -142,7 +142,7 @@ nsHTMLObjectElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLObjectElementIID)) {
nsIDOMHTMLObjectElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

2
content/html/content/src/nsHTMLSpacerElement.cpp
Просмотреть файл

@ -109,7 +109,7 @@ nsHTMLSpacerElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLSpacerElementIID)) {
nsIDOMHTMLSpacerElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
#endif

2
content/html/content/src/nsHTMLTableCaptionElement.cpp
Просмотреть файл

@ -110,7 +110,7 @@ nsHTMLTableCaptionElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLTableCaptionElementIID)) {
nsIDOMHTMLTableCaptionElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

4
content/html/content/src/nsHTMLTableCellElement.cpp
Просмотреть файл

@ -157,13 +157,13 @@ nsHTMLTableCellElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLTableCellElementIID)) {
nsIDOMHTMLTableCellElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
else if (aIID.Equals(kIHTMLTableCellElementIID)) {
nsIHTMLTableCellElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

4
content/html/content/src/nsHTMLTableColElement.cpp
Просмотреть файл

@ -126,13 +126,13 @@ nsHTMLTableColElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLTableColElementIID)) {
nsIDOMHTMLTableColElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
if (aIID.Equals(kIHTMLTableColElementIID)) {
nsIHTMLTableColElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

2
content/html/content/src/nsHTMLTableColGroupElement.cpp
Просмотреть файл

@ -121,7 +121,7 @@ nsHTMLTableColGroupElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLTableColElementIID)) {
nsIDOMHTMLTableColElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

2
content/html/content/src/nsHTMLTableElement.cpp
Просмотреть файл

@ -372,7 +372,7 @@ nsHTMLTableElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLTableElementIID)) {
nsIDOMHTMLTableElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

2
content/html/content/src/nsHTMLTableRowElement.cpp
Просмотреть файл

@ -269,7 +269,7 @@ nsHTMLTableRowElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLTableRowElementIID)) {
nsIDOMHTMLTableRowElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

2
content/html/content/src/nsHTMLTableSectionElement.cpp
Просмотреть файл

@ -130,7 +130,7 @@ nsHTMLTableSectionElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLTableSectionElementIID)) {
nsIDOMHTMLTableSectionElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

4
content/html/content/src/nsHTMLTextAreaElement.cpp
Просмотреть файл

@ -157,12 +157,12 @@ nsHTMLTextAreaElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
NS_IMPL_HTML_CONTENT_QUERY_INTERFACE(aIID, aInstancePtr, this)
if (aIID.Equals(kIDOMHTMLTextAreaElementIID)) {
*aInstancePtr = (void*)(nsIDOMHTMLTextAreaElement*) this;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
else if (aIID.Equals(kIFormControlIID)) {
*aInstancePtr = (void*)(nsIFormControl*) this;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
else if (aIID.Equals(kIFocusableContentIID)) {

2
content/html/content/src/nsHTMLTitleElement.cpp
Просмотреть файл

@ -115,7 +115,7 @@ nsHTMLTitleElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLTitleElementIID)) {
nsIDOMHTMLTitleElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

2
content/html/content/src/nsHTMLUListElement.cpp
Просмотреть файл

@ -115,7 +115,7 @@ nsHTMLUListElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLUListElementIID)) {
nsIDOMHTMLUListElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

2
content/html/content/src/nsHTMLWBRElement.cpp
Просмотреть файл

@ -108,7 +108,7 @@ nsHTMLWBRElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLWBRElementIID)) {
nsIDOMHTMLWBRElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
#endif

8
content/html/style/src/nsCSSRule.cpp
Просмотреть файл

@ -103,7 +103,9 @@ nsCSSRule::AddRef(void)
if (mInstance == kInstrument) {
fprintf(stdout, "%d AddRef CSSRule\n", mRefCnt + 1);
}
return ++mRefCnt;
++mRefCnt;
NS_LOG_ADDREF(this, mRefCnt, "nsCSSRule");
return mRefCnt;
}
nsrefcnt
@ -112,7 +114,9 @@ nsCSSRule::Release(void)
if (mInstance == kInstrument) {
fprintf(stdout, "%d Release CSSRule\n", mRefCnt - 1);
}
if (--mRefCnt == 0) {
--mRefCnt;
NS_LOG_RELEASE(this, mRefCnt, "nsCSSRule");
if (mRefCnt == 0) {
NS_DELETEXPCOM(this);
return 0;
}

8
content/html/style/src/nsHTMLAttributes.cpp
Просмотреть файл

@ -952,7 +952,9 @@ nsrefcnt HTMLAttributesImpl::AddRef(void)
if ((gInstrument == -1) || (mInstance == gInstrument)) {
fprintf(stdout, "%d AddRef HTMLAttributes %d\n", mRefCnt + 1, mInstance);
}
return ++mRefCnt;
++mRefCnt;
NS_LOG_ADDREF(this, mRefCnt, "HTMLAttributesImpl");
return mRefCnt;
}
nsrefcnt HTMLAttributesImpl::Release(void)
@ -960,7 +962,9 @@ nsrefcnt HTMLAttributesImpl::Release(void)
if ((gInstrument == -1) || (mInstance == gInstrument)) {
fprintf(stdout, "%d Release HTMLAttributes %d\n", mRefCnt - 1, mInstance);
}
if (--mRefCnt == 0) {
--mRefCnt;
NS_LOG_RELEASE(this, mRefCnt, "HTMLAttributesImpl");
if (mRefCnt == 0) {
delete this;
return 0;
}

17
docshell/base/nsWebShell.cpp
Просмотреть файл

@ -4239,21 +4239,8 @@ nsWebShellFactory::QueryInterface(const nsIID &aIID, void **aResult)
return NS_OK;
}
nsrefcnt
nsWebShellFactory::AddRef()
{
return ++mRefCnt;
}
nsrefcnt
nsWebShellFactory::Release()
{
if (--mRefCnt == 0) {
delete this;
return 0; // Don't access mRefCnt after deleting!
}
return mRefCnt;
}
NS_IMPL_ADDREF(nsWebShellFactory);
NS_IMPL_RELEASE(nsWebShellFactory);
nsresult
nsWebShellFactory::CreateInstance(nsISupports *aOuter,

15
dom/src/build/nsDOMFactory.cpp
Просмотреть файл

@ -652,19 +652,8 @@ nsresult nsDOMFactory::QueryInterface(const nsIID &aIID,
return NS_OK;
}
nsrefcnt nsDOMFactory::AddRef()
{
return ++mRefCnt;
}
nsrefcnt nsDOMFactory::Release()
{
if (--mRefCnt == 0) {
delete this;
return 0; // Don't access mRefCnt after deleting!
}
return mRefCnt;
}
NS_IMPL_ADDREF(nsDOMFactory);
NS_IMPL_RELEASE(nsDOMFactory);
nsresult nsDOMFactory::CreateInstance(nsISupports *aOuter,
const nsIID &aIID,

15
gfx/src/beos/nsGfxFactoryBeOS.cpp
Просмотреть файл

@ -100,19 +100,8 @@ nsresult nsGfxFactoryBeOS::QueryInterface(const nsIID &aIID,
return NS_OK;
}
nsrefcnt nsGfxFactoryBeOS::AddRef()
{
return ++mRefCnt;
}
nsrefcnt nsGfxFactoryBeOS::Release()
{
if (--mRefCnt == 0) {
delete this;
return 0; // Don't access mRefCnt after deleting!
}
return mRefCnt;
}
NS_IMPL_ADDREF(nsGfxFactoryBeOS);
NS_IMPL_RELEASE(nsGfxFactoryBeOS);
nsresult nsGfxFactoryBeOS::CreateInstance(nsISupports *aOuter,
const nsIID &aIID,

15
gfx/src/gtk/nsGfxFactoryGTK.cpp
Просмотреть файл

@ -105,19 +105,8 @@ nsresult nsGfxFactoryGTK::QueryInterface(const nsIID &aIID,
return NS_OK;
}
nsrefcnt nsGfxFactoryGTK::AddRef()
{
return ++mRefCnt;
}
nsrefcnt nsGfxFactoryGTK::Release()
{
if (--mRefCnt == 0) {
delete this;
return 0; // Don't access mRefCnt after deleting!
}
return mRefCnt;
}
NS_IMPL_ADDREF(nsGfxFactoryGTK);
NS_IMPL_RELEASE(nsGfxFactoryGTK);
nsresult nsGfxFactoryGTK::CreateInstance(nsISupports *aOuter,
const nsIID &aIID,

15
gfx/src/mac/nsGfxFactoryMac.cpp
Просмотреть файл

@ -98,19 +98,8 @@ nsresult nsGfxFactoryMac::QueryInterface(const nsIID &aIID,
return NS_OK;
}
nsrefcnt nsGfxFactoryMac::AddRef()
{
return ++mRefCnt;
}
nsrefcnt nsGfxFactoryMac::Release()
{
if (--mRefCnt == 0) {
delete this;
return 0; // Don't access mRefCnt after deleting!
}
return mRefCnt;
}
NS_IMPL_ADDREF(nsGfxFactoryMac);
NS_IMPL_RELEASE(nsGfxFactoryMac);
nsresult nsGfxFactoryMac::CreateInstance(nsISupports *aOuter,
const nsIID &aIID,

15
gfx/src/motif/nsGfxFactoryMotif.cpp
Просмотреть файл

@ -95,19 +95,8 @@ nsresult nsGfxFactoryMotif::QueryInterface(const nsIID &aIID,
return NS_OK;
}
nsrefcnt nsGfxFactoryMotif::AddRef()
{
return ++mRefCnt;
}
nsrefcnt nsGfxFactoryMotif::Release()
{
if (--mRefCnt == 0) {
delete this;
return 0; // Don't access mRefCnt after deleting!
}
return mRefCnt;
}
NS_IMPL_ADDREF(nsGfxFactoryMotif);
NS_IMPL_RELEASE(nsGfxFactoryMotif);
nsresult nsGfxFactoryMotif::CreateInstance(nsISupports *aOuter,
const nsIID &aIID,

18
gfx/src/photon/nsGfxFactoryPh.cpp
Просмотреть файл

@ -109,22 +109,8 @@ nsresult nsGfxFactoryPh::QueryInterface(const nsIID &aIID,
return NS_OK;
}
nsrefcnt nsGfxFactoryPh::AddRef()
{
PR_LOG(PhGfxLog, PR_LOG_DEBUG,("nsGfxFactoryPh::AddRef\n"));
return ++mRefCnt;
}
nsrefcnt nsGfxFactoryPh::Release()
{
PR_LOG(PhGfxLog, PR_LOG_DEBUG,("nsGfxFactoryPh::Release\n"));
if (--mRefCnt == 0) {
delete this;
return 0; // Don't access mRefCnt after deleting!
}
return mRefCnt;
}
NS_IMPL_ADDREF(nsGfxFactoryPh);
NS_IMPL_RELEASE(nsGfxFactoryPh);
nsresult nsGfxFactoryPh::CreateInstance(nsISupports *aOuter,
const nsIID &aIID,

18
gfx/src/qt/nsGfxFactoryQT.cpp
Просмотреть файл

@ -109,22 +109,8 @@ nsresult nsGfxFactoryQT::QueryInterface(const nsIID &aIID,
return NS_OK;
}
nsrefcnt nsGfxFactoryQT::AddRef()
{
PR_LOG(QtGfxLM, PR_LOG_DEBUG, ("nsGfxFactoryQT::AddRef()\n"));
return ++mRefCnt;
}
nsrefcnt nsGfxFactoryQT::Release()
{
PR_LOG(QtGfxLM, PR_LOG_DEBUG, ("nsGfxFactoryQT::Release()\n"));
if (--mRefCnt == 0)
{
delete this;
return 0; // Don't access mRefCnt after deleting!
}
return mRefCnt;
}
NS_IMPL_ADDREF(nsGfxFactoryQT);
NS_IMPL_RELEASE(nsGfxFactoryQT);
nsresult nsGfxFactoryQT::CreateInstance(nsISupports *aOuter,
const nsIID &aIID,

15
gfx/src/windows/nsGfxFactoryWin.cpp
Просмотреть файл

@ -117,19 +117,8 @@ nsresult nsGfxFactoryWin::QueryInterface(const nsIID &aIID,
return NS_OK;
}
nsrefcnt nsGfxFactoryWin::AddRef()
{
return ++mRefCnt;
}
nsrefcnt nsGfxFactoryWin::Release()
{
if (--mRefCnt == 0) {
delete this;
return 0; // Don't access mRefCnt after deleting!
}
return mRefCnt;
}
NS_IMPL_ADDREF(nsGfxFactoryWin);
NS_IMPL_RELEASE(nsGfxFactoryWin);
nsresult nsGfxFactoryWin::CreateInstance(nsISupports *aOuter,
const nsIID &aIID,

15
gfx/src/xlib/nsGfxFactoryXlib.cpp
Просмотреть файл

@ -97,19 +97,8 @@ nsresult nsGfxFactoryXlib::QueryInterface(const nsIID &aIID,
return NS_OK;
}
nsrefcnt nsGfxFactoryXlib::AddRef()
{
return ++mRefCnt;
}
nsrefcnt nsGfxFactoryXlib::Release()
{
if (--mRefCnt == 0) {
delete this;
return 0; // don't access mRefCnt after a delete!
}
return mRefCnt;
}
NS_IMPL_ADDREF(nsGfxFactoryXlib);
NS_IMPL_RELEASE(nsGfxFactoryXlib);
nsresult nsGfxFactoryXlib::CreateInstance(nsISupports *aOuter,
const nsIID &aIID,

15
htmlparser/src/nsParserFactory.cpp
Просмотреть файл

@ -102,19 +102,8 @@ nsresult nsParserFactory::QueryInterface(const nsIID &aIID,
return NS_OK;
}
nsrefcnt nsParserFactory::AddRef()
{
return ++mRefCnt;
}
nsrefcnt nsParserFactory::Release()
{
if (--mRefCnt == 0) {
delete this;
return 0; // Don't access mRefCnt after deleting!
}
return mRefCnt;
}
NS_IMPL_ADDREF(nsParserFactory);
NS_IMPL_RELEASE(nsParserFactory);
nsresult nsParserFactory::CreateInstance(nsISupports *aOuter,
const nsIID &aIID,

15
intl/locale/src/mac/nsLocaleFactoryMac.cpp
Просмотреть файл

@ -69,19 +69,8 @@ nsresult nsLocaleMacFactory::QueryInterface(const nsIID &aIID,
return NS_OK;
}
nsrefcnt nsLocaleMacFactory::AddRef()
{
return ++mRefCnt;
}
nsrefcnt nsLocaleMacFactory::Release()
{
if (--mRefCnt == 0) {
delete this;
return 0; // Don't access mRefCnt after deleting!
}
return mRefCnt;
}
NS_IMPL_ADDREF(nsLocaleMacFactory);
NS_IMPL_RELEASE(nsLocaleMacFactory);
nsresult nsLocaleMacFactory::CreateInstance(nsISupports *aOuter,
const nsIID &aIID,

18
intl/locale/src/mac/nsMacLocaleFactory.cpp
Просмотреть файл

@ -105,19 +105,5 @@ nsMacLocaleFactory::LockFactory(PRBool aBool)
return NS_OK;
}
nsrefcnt
nsMacLocaleFactory::AddRef()
{
return ++mRefCnt;
}
nsrefcnt
nsMacLocaleFactory::Release()
{
if (--mRefCnt == 0) {
delete this;
return 0; // Don't access mRefCnt after deleting!
}
return mRefCnt;
}
NS_IMPL_ADDREF(nsMacLocaleFactory);
NS_IMPL_RELEASE(nsMacLocaleFactory);

15
intl/locale/src/unix/nsLocaleFactoryUnix.cpp
Просмотреть файл

@ -70,19 +70,8 @@ nsresult nsLocaleUnixFactory::QueryInterface(const nsIID &aIID,
return NS_OK;
}
nsrefcnt nsLocaleUnixFactory::AddRef()
{
return ++mRefCnt;
}
nsrefcnt nsLocaleUnixFactory::Release()
{
if (--mRefCnt == 0) {
delete this;
return 0; // Don't access mRefCnt after deleting!
}
return mRefCnt;
}
NS_IMPL_ADDREF(nsLocaleUnixFactory);
NS_IMPL_RELEASE(nsLocaleUnixFactory);
nsresult nsLocaleUnixFactory::CreateInstance(nsISupports *aOuter,
const nsIID &aIID,

18
intl/locale/src/unix/nsPosixLocaleFactory.cpp
Просмотреть файл

@ -105,19 +105,5 @@ nsPosixLocaleFactory::LockFactory(PRBool aBool)
return NS_OK;
}
nsrefcnt
nsPosixLocaleFactory::AddRef()
{
return ++mRefCnt;
}
nsrefcnt
nsPosixLocaleFactory::Release()
{
if (--mRefCnt == 0) {
delete this;
return 0; // Don't access mRefCnt after deleting!
}
return mRefCnt;
}
NS_IMPL_ADDREF(nsPosixLocaleFactory);
NS_IMPL_RELEASE(nsPosixLocaleFactory);

18
intl/locale/src/windows/nsIWin32LocaleFactory.cpp
Просмотреть файл

@ -104,19 +104,5 @@ nsIWin32LocaleFactory::LockFactory(PRBool aBool)
return NS_OK;
}
nsrefcnt
nsIWin32LocaleFactory::AddRef()
{
return ++mRefCnt;
}
nsrefcnt
nsIWin32LocaleFactory::Release()
{
if (--mRefCnt == 0) {
delete this;
return 0; // Don't access mRefCnt after deleting!
}
return mRefCnt;
}
NS_IMPL_ADDREF(nsIWin32LocaleFactory);
NS_IMPL_RELEASE(nsIWin32LocaleFactory);

15
intl/locale/src/windows/nsLocaleFactoryWin.cpp
Просмотреть файл

@ -69,19 +69,8 @@ nsresult nsLocaleWinFactory::QueryInterface(const nsIID &aIID,
return NS_OK;
}
nsrefcnt nsLocaleWinFactory::AddRef()
{
return ++mRefCnt;
}
nsrefcnt nsLocaleWinFactory::Release()
{
if (--mRefCnt == 0) {
delete this;
return 0; // Don't access mRefCnt after deleting!
}
return mRefCnt;
}
NS_IMPL_ADDREF(nsLocaleWinFactory);
NS_IMPL_RELEASE(nsLocaleWinFactory);
nsresult nsLocaleWinFactory::CreateInstance(nsISupports *aOuter,
const nsIID &aIID,

9
js/src/xpconnect/src/xpcstack.cpp
Просмотреть файл

@ -181,15 +181,18 @@ XPCJSStackFrame::AddRef(void)
{
if(mStack)
mStack->AddRef();
return ++mRefCnt;
++mRefCnt;
NS_LOG_ADDREF(this, mRefCnt, "XPCJSStackFrame");
return mRefCnt;
}
nsrefcnt
XPCJSStackFrame::Release(void)
{
// use a local since there can be recursion here.
nsrefcnt count;
if(0 == (count = --mRefCnt))
nsrefcnt count = --mRefCnt;
NS_LOG_RELEASE(this, mRefCnt, "XPCJSStackFrame");
if(0 == count)
{
NS_DELETEXPCOM(this);
return 0;

18
js/src/xpconnect/src/xpcwrappedjs.cpp
Просмотреть файл

@ -71,8 +71,9 @@ nsrefcnt
nsXPCWrappedJS::AddRef(void)
{
NS_PRECONDITION(mRoot, "bad root");
if(1 == ++mRefCnt && mRoot && mRoot != this)
++mRefCnt;
NS_LOG_ADDREF(this, mRefCnt, "nsXPCWrappedJS");
if(1 == mRefCnt && mRoot && mRoot != this)
NS_ADDREF(mRoot);
return mRefCnt;
@ -83,8 +84,9 @@ nsXPCWrappedJS::Release(void)
{
NS_PRECONDITION(mRoot, "bad root");
NS_PRECONDITION(0 != mRefCnt, "dup release");
if(0 == --mRefCnt)
--mRefCnt;
NS_LOG_RELEASE(this, mRefCnt, "nsXPCWrappedJS");
if(0 == mRefCnt)
{
if(mRoot == this)
{
@ -308,7 +310,9 @@ nsrefcnt
nsXPCWrappedJSMethods::AddRef(void)
{
NS_PRECONDITION(mWrapper, "bad state");
if(2 == ++mRefCnt)
++mRefCnt;
NS_LOG_ADDREF(this, mRefCnt, "nsXPCWrappedJSMethods");
if(2 == mRefCnt)
NS_ADDREF(mWrapper);
return mRefCnt;
}
@ -317,7 +321,9 @@ nsrefcnt
nsXPCWrappedJSMethods::Release(void)
{
NS_PRECONDITION(mWrapper, "bad state");
if(0 == --mRefCnt)
--mRefCnt;
NS_LOG_RELEASE(this, mRefCnt, "nsXPCWrappedJSMethods");
if(0 == mRefCnt)
{
NS_DELETEXPCOM(this);
return 0;

10
js/src/xpconnect/src/xpcwrappednative.cpp
Просмотреть файл

@ -45,8 +45,9 @@ nsXPCWrappedNative::AddRef(void)
{
NS_PRECONDITION(mRoot, "bad root");
XPCContext* xpcc;
if(1 == ++mRefCnt && mRoot != this)
++mRefCnt;
NS_LOG_ADDREF(this, mRefCnt, "nsXPCWrappedNative");
if(1 == mRefCnt && mRoot != this)
NS_ADDREF(mRoot);
else if(2 == mRefCnt && nsnull != (xpcc = mClass->GetXPCContext()))
JS_AddNamedRoot(xpcc->GetJSContext(), &mJSObj,
@ -59,8 +60,9 @@ nsXPCWrappedNative::Release(void)
{
NS_PRECONDITION(mRoot, "bad root");
NS_PRECONDITION(0 != mRefCnt, "dup release");
if(0 == --mRefCnt)
--mRefCnt;
NS_LOG_RELEASE(this, mRefCnt, "nsXPCWrappedNative");
if(0 == mRefCnt)
{
NS_DELETEXPCOM(this); // also unlinks us from chain
return 0;

19
layout/base/nsPresContext.cpp
Просмотреть файл

@ -119,24 +119,7 @@ nsPresContext::~nsPresContext()
}
}
nsrefcnt
nsPresContext::AddRef(void)
{
return ++mRefCnt;
}
nsrefcnt
nsPresContext::Release(void)
{
NS_PRECONDITION(0 != mRefCnt, "bad refcnt");
if (--mRefCnt == 0) {
delete this;
return 0;
}
return mRefCnt;
}
NS_IMPL_QUERY_INTERFACE(nsPresContext, kIPresContextIID);
NS_IMPL_ISUPPORTS(nsPresContext, kIPresContextIID);
void
nsPresContext::GetUserPreferences()

8
layout/base/nsPresShell.cpp
Просмотреть файл

@ -426,7 +426,9 @@ nsrefcnt PresShell::AddRef(void)
if (gsNoisyRefs) {
printf("PresShell: AddRef: %p, cnt = %d \n",this, mRefCnt+1);
}
return ++mRefCnt;
++mRefCnt;
NS_LOG_ADDREF(this, mRefCnt, "PresShell");
return mRefCnt;
}
// for debugging only
@ -435,7 +437,9 @@ nsrefcnt PresShell::Release(void)
if (gsNoisyRefs) {
printf("PresShell Release: %p, cnt = %d \n",this, mRefCnt-1);
}
if (--mRefCnt == 0) {
--mRefCnt;
NS_LOG_RELEASE(this, mRefCnt, "PresShell");
if (mRefCnt == 0) {
if (gsNoisyRefs) {
printf("PresShell Delete: %p, \n",this);
}

5
layout/base/src/nsFrameImageLoader.cpp
Просмотреть файл

@ -91,6 +91,7 @@ nsrefcnt nsFrameImageLoader::AddRef(void)
{
NS_PRECONDITION(PRInt32(mRefCnt) >= 0, "illegal refcnt");
__log_addref((void*) this, mRefCnt, mRefCnt + 1);
NS_LOG_ADDREF(this, mRefCnt, "nsFrameImageLoader");
return ++mRefCnt;
}
@ -98,7 +99,9 @@ nsrefcnt nsFrameImageLoader::Release(void)
{
__log_release((void*) this, mRefCnt, mRefCnt - 1);
NS_PRECONDITION(0 != mRefCnt, "dup release");
if (--mRefCnt == 0) {
--mRefCnt;
NS_LOG_RELEASE(this, mRefCnt, "nsFrameImageLoader");
if (mRefCnt == 0) {
NS_DELETEXPCOM(this);
return 0;
}

19
layout/base/src/nsPresContext.cpp
Просмотреть файл

@ -119,24 +119,7 @@ nsPresContext::~nsPresContext()
}
}
nsrefcnt
nsPresContext::AddRef(void)
{
return ++mRefCnt;
}
nsrefcnt
nsPresContext::Release(void)
{
NS_PRECONDITION(0 != mRefCnt, "bad refcnt");
if (--mRefCnt == 0) {
delete this;
return 0;
}
return mRefCnt;
}
NS_IMPL_QUERY_INTERFACE(nsPresContext, kIPresContextIID);
NS_IMPL_ISUPPORTS(nsPresContext, kIPresContextIID);
void
nsPresContext::GetUserPreferences()

16
layout/base/src/nsStyleContext.cpp
Просмотреть файл

@ -1470,14 +1470,18 @@ nsrefcnt StyleContextImpl::AddRef(void)
{
NS_PRECONDITION(PRInt32(mRefCnt) >= 0, "illegal refcnt");
__log_addref((void*) this, mRefCnt, mRefCnt + 1);
return ++mRefCnt;
++mRefCnt;
NS_LOG_ADDREF(this, mRefCnt, "StyleContextImpl");
return mRefCnt;
}
nsrefcnt StyleContextImpl::Release(void)
{
NS_PRECONDITION(0 != mRefCnt, "dup release");
__log_release((void*) this, mRefCnt, mRefCnt - 1);
if (--mRefCnt == 0) {
--mRefCnt;
NS_LOG_RELEASE(this, mRefCnt, "StyleContextImpl");
if (mRefCnt == 0) {
NS_DELETEXPCOM(this);
return 0;
}
@ -1493,7 +1497,9 @@ nsrefcnt StyleContextImpl::AddRef(void)
if ((gInstrument == -1) || (mInstance == gInstrument)) {
fprintf(stdout, "%d AddRef StyleContext %d\n", mRefCnt + 1, mInstance);
}
return ++mRefCnt;
++mRefCnt;
NS_LOG_ADDREF(this, mRefCnt, "StyleContextImpl");
return mRefCnt;
}
nsrefcnt StyleContextImpl::Release(void)
@ -1501,7 +1507,9 @@ nsrefcnt StyleContextImpl::Release(void)
if ((gInstrument == -1) || (mInstance == gInstrument)) {
fprintf(stdout, "%d Release StyleContext %d\n", mRefCnt - 1, mInstance);
}
if (--mRefCnt == 0) {
--mRefCnt;
NS_LOG_RELEASE(this, mRefCnt, "StyleContextImpl");
if (mRefCnt == 0) {
delete this;
return 0;
}

1
layout/generic/nsImageFrame.cpp
Просмотреть файл

@ -575,6 +575,7 @@ nsImageFrame::GetImageMap()
if (NS_SUCCEEDED(rv)) {
mImageMap = new nsImageMap();
if (nsnull != mImageMap) {
NS_ADDREF(mImageMap);
mImageMap->Init(map);
}
NS_IF_RELEASE(map);

2
layout/generic/nsImageMap.cpp
Просмотреть файл

@ -685,9 +685,9 @@ static NS_DEFINE_IID(kIDocumentObserverIID, NS_IDOCUMENT_OBSERVER_IID);
nsImageMap::nsImageMap()
{
NS_INIT_REFCNT();
mMap = nsnull;
mDomMap = nsnull;
mRefCnt = 1;
mDocument = nsnull;
mContainsBlockContents = PR_FALSE;
}

1
layout/html/base/src/nsImageFrame.cpp
Просмотреть файл

@ -575,6 +575,7 @@ nsImageFrame::GetImageMap()
if (NS_SUCCEEDED(rv)) {
mImageMap = new nsImageMap();
if (nsnull != mImageMap) {
NS_ADDREF(mImageMap);
mImageMap->Init(map);
}
NS_IF_RELEASE(map);

2
layout/html/base/src/nsImageMap.cpp
Просмотреть файл

@ -685,9 +685,9 @@ static NS_DEFINE_IID(kIDocumentObserverIID, NS_IDOCUMENT_OBSERVER_IID);
nsImageMap::nsImageMap()
{
NS_INIT_REFCNT();
mMap = nsnull;
mDomMap = nsnull;
mRefCnt = 1;
mDocument = nsnull;
mContainsBlockContents = PR_FALSE;
}

8
layout/html/base/src/nsPresShell.cpp
Просмотреть файл

@ -426,7 +426,9 @@ nsrefcnt PresShell::AddRef(void)
if (gsNoisyRefs) {
printf("PresShell: AddRef: %p, cnt = %d \n",this, mRefCnt+1);
}
return ++mRefCnt;
++mRefCnt;
NS_LOG_ADDREF(this, mRefCnt, "PresShell");
return mRefCnt;
}
// for debugging only
@ -435,7 +437,9 @@ nsrefcnt PresShell::Release(void)
if (gsNoisyRefs) {
printf("PresShell Release: %p, cnt = %d \n",this, mRefCnt-1);
}
if (--mRefCnt == 0) {
--mRefCnt;
NS_LOG_RELEASE(this, mRefCnt, "PresShell");
if (mRefCnt == 0) {
if (gsNoisyRefs) {
printf("PresShell Delete: %p, \n",this);
}

2
layout/html/content/src/nsHTMLAnchorElement.cpp
Просмотреть файл

@ -151,7 +151,7 @@ nsHTMLAnchorElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLAnchorElementIID)) {
nsIDOMHTMLAnchorElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
else if (aIID.Equals(kIFocusableContentIID)) {

2
layout/html/content/src/nsHTMLAppletElement.cpp
Просмотреть файл

@ -151,7 +151,7 @@ nsHTMLAppletElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLAppletElementIID)) {
nsIDOMHTMLAppletElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

2
layout/html/content/src/nsHTMLBodyElement.cpp
Просмотреть файл

@ -595,7 +595,7 @@ nsHTMLBodyElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLBodyElementIID)) {
nsIDOMHTMLBodyElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

7
layout/html/content/src/nsHTMLButtonElement.cpp
Просмотреть файл

@ -155,7 +155,9 @@ nsHTMLButtonElement::~nsHTMLButtonElement()
NS_IMETHODIMP_(nsrefcnt)
nsHTMLButtonElement::AddRef(void)
{
return ++mRefCnt;
++mRefCnt;
NS_LOG_ADDREF(this, mRefCnt, "nsHTMLButtonElement");
return mRefCnt;
}
nsresult
@ -164,7 +166,7 @@ nsHTMLButtonElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
NS_IMPL_HTML_CONTENT_QUERY_INTERFACE(aIID, aInstancePtr, this)
if (aIID.Equals(kIDOMHTMLButtonElementIID)) {
*aInstancePtr = (void*)(nsIDOMHTMLButtonElement*)this;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
else if (aIID.Equals(kIFormControlIID)) {
@ -184,6 +186,7 @@ NS_IMETHODIMP_(nsrefcnt)
nsHTMLButtonElement::Release()
{
--mRefCnt;
NS_LOG_RELEASE(this, mRefCnt, "nsHTMLButtonElement");
if (mRefCnt <= 0) {
delete this;
return 0;

2
layout/html/content/src/nsHTMLDListElement.cpp
Просмотреть файл

@ -110,7 +110,7 @@ nsHTMLDListElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLDListElementIID)) {
nsIDOMHTMLDListElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

2
layout/html/content/src/nsHTMLDelElement.cpp
Просмотреть файл

@ -111,7 +111,7 @@ nsHTMLDelElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLModElementIID)) {
nsIDOMHTMLModElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

2
layout/html/content/src/nsHTMLDirectoryElement.cpp
Просмотреть файл

@ -114,7 +114,7 @@ nsHTMLDirectoryElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLDirectoryElementIID)) {
nsIDOMHTMLDirectoryElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

2
layout/html/content/src/nsHTMLDivElement.cpp
Просмотреть файл

@ -112,7 +112,7 @@ nsHTMLDivElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLDivElementIID)) {
nsIDOMHTMLDivElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

2
layout/html/content/src/nsHTMLEmbedElement.cpp
Просмотреть файл

@ -110,7 +110,7 @@ nsHTMLEmbedElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLEmbedElementIID)) {
nsIDOMHTMLEmbedElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
#endif

4
layout/html/content/src/nsHTMLFieldSetElement.cpp
Просмотреть файл

@ -145,12 +145,12 @@ nsHTMLFieldSetElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
NS_IMPL_HTML_CONTENT_QUERY_INTERFACE(aIID, aInstancePtr, this)
if (aIID.Equals(kIDOMHTMLFieldSetElementIID)) {
*aInstancePtr = (void*)(nsIDOMHTMLFieldSetElement*)this;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
else if (aIID.Equals(kIFormControlIID)) {
*aInstancePtr = (void*)(nsIFormControl*)this;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

2
layout/html/content/src/nsHTMLFontElement.cpp
Просмотреть файл

@ -117,7 +117,7 @@ nsHTMLFontElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLFontElementIID)) {
nsIDOMHTMLFontElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

5
layout/html/content/src/nsHTMLFormElement.cpp
Просмотреть файл

@ -243,7 +243,9 @@ NS_IMETHODIMP_(nsrefcnt)
nsHTMLFormElement::AddRef(void)
{
//nsTraceRefcnt::AddRef((nsIForm*)this, mRefCnt+1, __FILE__, __LINE__);
return ++mRefCnt;
++mRefCnt;
NS_LOG_ADDREF(this, mRefCnt, "nsHTMLFormElement");
return mRefCnt;
}
NS_IMETHODIMP_(nsrefcnt)
@ -251,6 +253,7 @@ nsHTMLFormElement::Release()
{
//nsTraceRefcnt::Release((nsIForm*)this, mRefCnt-1, __FILE__, __LINE__);
--mRefCnt;
NS_LOG_RELEASE(this, mRefCnt, "nsHTMLFormElement");
PRUint32 numChildren;
GetElementCount(&numChildren);
if (mRefCnt == nsrefcnt(numChildren)) {

2
layout/html/content/src/nsHTMLFrameElement.cpp
Просмотреть файл

@ -123,7 +123,7 @@ nsHTMLFrameElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLFrameElementIID)) {
nsIDOMHTMLFrameElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

2
layout/html/content/src/nsHTMLFrameSetElement.cpp
Просмотреть файл

@ -111,7 +111,7 @@ nsHTMLFrameSetElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLFrameSetElementIID)) {
nsIDOMHTMLFrameSetElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

2
layout/html/content/src/nsHTMLHeadingElement.cpp
Просмотреть файл

@ -110,7 +110,7 @@ nsHTMLHeadingElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLHeadingElementIID)) {
nsIDOMHTMLHeadingElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

2
layout/html/content/src/nsHTMLHtmlElement.cpp
Просмотреть файл

@ -113,7 +113,7 @@ nsHTMLHtmlElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLHtmlElementIID)) {
nsIDOMHTMLHtmlElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

2
layout/html/content/src/nsHTMLIFrameElement.cpp
Просмотреть файл

@ -135,7 +135,7 @@ nsHTMLIFrameElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLIFrameElementIID)) {
nsIDOMHTMLIFrameElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

2
layout/html/content/src/nsHTMLImageElement.cpp
Просмотреть файл

@ -183,7 +183,7 @@ nsHTMLImageElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLImageElementIID)) {
nsIDOMHTMLImageElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
if (aIID.Equals(kIJSNativeInitializerIID)) {

5
layout/html/content/src/nsHTMLInputElement.cpp
Просмотреть файл

@ -190,7 +190,9 @@ nsHTMLInputElement::~nsHTMLInputElement()
NS_IMETHODIMP_(nsrefcnt)
nsHTMLInputElement::AddRef(void)
{
return ++mRefCnt;
++mRefCnt;
NS_LOG_ADDREF(this, mRefCnt, "nsHTMLInputElement");
return mRefCnt;
}
@ -220,6 +222,7 @@ NS_IMETHODIMP_(nsrefcnt)
nsHTMLInputElement::Release()
{
--mRefCnt;
NS_LOG_RELEASE(this, mRefCnt, "nsHTMLInputElement");
if (mRefCnt <= 0) {
delete this;
return 0;

2
layout/html/content/src/nsHTMLInsElement.cpp
Просмотреть файл

@ -111,7 +111,7 @@ nsHTMLInsElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (aIID.Equals(kIDOMHTMLModElementIID)) {
nsIDOMHTMLModElement* tmp = this;
*aInstancePtr = (void*) tmp;
mRefCnt++;
NS_ADDREF_THIS();
return NS_OK;
}
return NS_NOINTERFACE;

Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше