From 659b2712edc7bef5b92382ed918a9bed66d1562a Mon Sep 17 00:00:00 2001 From: "jdunn%netscape.com" Date: Thu, 17 Feb 2000 23:19:18 +0000 Subject: [PATCH] Fix problem with NS_IF_ADDREF on member variables inside of const member functions. This includes removing all references to NS_DEF_PTR and the including of nsIPtr.h r=troy@netscape.com,dougt@netscape.com,scc@netscape.com # 28114 a=chofmann@netscape.com git-svn-id: svn://10.0.0.236/trunk@61237 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/base/src/nsGenericElement.cpp | 2 +- mozilla/content/base/src/nsHTMLValue.h | 5 +++-- mozilla/content/base/src/nsStyleContext.cpp | 5 +++-- mozilla/content/html/style/src/nsCSSStyleRule.cpp | 5 +++-- mozilla/content/html/style/src/nsCSSStyleSheet.cpp | 11 +---------- mozilla/content/html/style/src/nsHTMLAttributes.cpp | 2 +- mozilla/content/html/style/src/nsHTMLValue.h | 5 +++-- mozilla/content/shared/public/nsHTMLValue.h | 5 +++-- mozilla/layout/base/src/nsGenericElement.cpp | 2 +- mozilla/layout/base/src/nsStyleContext.cpp | 5 +++-- mozilla/layout/generic/nsFrame.cpp | 2 +- mozilla/layout/html/base/src/nsFrame.cpp | 2 +- mozilla/layout/html/style/src/nsCSSStyleRule.cpp | 5 +++-- mozilla/layout/html/style/src/nsCSSStyleSheet.cpp | 11 +---------- mozilla/layout/html/style/src/nsHTMLAttributes.cpp | 2 +- mozilla/layout/html/style/src/nsHTMLValue.h | 5 +++-- .../html/table/src/FixedTableLayoutStrategy.cpp | 3 --- mozilla/layout/html/table/src/nsTableCellFrame.cpp | 2 -- .../layout/html/table/src/nsTableColGroupFrame.cpp | 3 --- mozilla/layout/html/table/src/nsTableFrame.cpp | 4 ---- mozilla/layout/html/table/src/nsTableRowFrame.cpp | 3 --- .../layout/html/table/src/nsTableRowGroupFrame.cpp | 4 ---- mozilla/layout/style/nsCSSStyleRule.cpp | 5 +++-- mozilla/layout/style/nsCSSStyleSheet.cpp | 11 +---------- mozilla/layout/style/nsStyleContext.cpp | 5 +++-- mozilla/layout/tables/FixedTableLayoutStrategy.cpp | 3 --- mozilla/layout/tables/nsTableCellFrame.cpp | 2 -- mozilla/layout/tables/nsTableColGroupFrame.cpp | 3 --- mozilla/layout/tables/nsTableFrame.cpp | 4 ---- mozilla/layout/tables/nsTableRowFrame.cpp | 3 --- mozilla/layout/tables/nsTableRowGroupFrame.cpp | 4 ---- .../layout/xml/content/src/nsGenericXMLElement.cpp | 6 ++---- mozilla/layout/xul/base/src/nsTreeOuterFrame.h | 2 +- mozilla/xpfe/appshell/src/nsJSXPConnectFactory.cpp | 3 --- mozilla/xpinstall/public/nsIDOMInstallVersion.h | 2 +- mozilla/xpinstall/src/nsJSInstallTriggerGlobal.cpp | 3 --- mozilla/xpinstall/src/nsJSInstallVersion.cpp | 8 +++----- 37 files changed, 46 insertions(+), 111 deletions(-) diff --git a/mozilla/content/base/src/nsGenericElement.cpp b/mozilla/content/base/src/nsGenericElement.cpp index 212e804b7b8..8366792124b 100644 --- a/mozilla/content/base/src/nsGenericElement.cpp +++ b/mozilla/content/base/src/nsGenericElement.cpp @@ -962,8 +962,8 @@ nsGenericElement::GetNameSpaceID(PRInt32& aResult) const nsresult nsGenericElement::GetTag(nsIAtom*& aResult) const { - NS_IF_ADDREF(mTag); aResult = mTag; + NS_IF_ADDREF(aResult); return NS_OK; } diff --git a/mozilla/content/base/src/nsHTMLValue.h b/mozilla/content/base/src/nsHTMLValue.h index 77da67483fe..39d5cd557ce 100644 --- a/mozilla/content/base/src/nsHTMLValue.h +++ b/mozilla/content/base/src/nsHTMLValue.h @@ -142,8 +142,9 @@ inline nsISupports* nsHTMLValue::GetISupportsValue(void) const { NS_ASSERTION(mUnit == eHTMLUnit_ISupports, "not an ISupports value"); if (mUnit == eHTMLUnit_ISupports) { - NS_IF_ADDREF(mValue.mISupports); - return mValue.mISupports; + nsISupports *result = mValue.mISupports; + NS_IF_ADDREF(result); + return result; } return nsnull; } diff --git a/mozilla/content/base/src/nsStyleContext.cpp b/mozilla/content/base/src/nsStyleContext.cpp index 92bc7178239..d73e1b6fcaf 100644 --- a/mozilla/content/base/src/nsStyleContext.cpp +++ b/mozilla/content/base/src/nsStyleContext.cpp @@ -1847,8 +1847,9 @@ void StyleContextImpl::RemoveChild(StyleContextImpl* aChild) nsISupportsArray* StyleContextImpl::GetStyleRules(void) const { - NS_IF_ADDREF(mRules); - return mRules; + nsISupportsArray* result = mRules; + NS_IF_ADDREF(result); + return result; } PRInt32 StyleContextImpl::GetStyleRuleCount(void) const diff --git a/mozilla/content/html/style/src/nsCSSStyleRule.cpp b/mozilla/content/html/style/src/nsCSSStyleRule.cpp index 41c14beff65..23cb3fef91d 100644 --- a/mozilla/content/html/style/src/nsCSSStyleRule.cpp +++ b/mozilla/content/html/style/src/nsCSSStyleRule.cpp @@ -982,8 +982,9 @@ void CSSStyleRuleImpl::GetSourceSelectorText(nsString& aSelectorText) const nsICSSDeclaration* CSSStyleRuleImpl::GetDeclaration(void) const { - NS_IF_ADDREF(mDeclaration); - return mDeclaration; + nsICSSDeclaration* result = mDeclaration; + NS_IF_ADDREF(result); + return result; } void CSSStyleRuleImpl::SetDeclaration(nsICSSDeclaration* aDeclaration) diff --git a/mozilla/content/html/style/src/nsCSSStyleSheet.cpp b/mozilla/content/html/style/src/nsCSSStyleSheet.cpp index 5fc553b13e7..727885b6cbf 100644 --- a/mozilla/content/html/style/src/nsCSSStyleSheet.cpp +++ b/mozilla/content/html/style/src/nsCSSStyleSheet.cpp @@ -47,7 +47,6 @@ static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); #include "nsIFrame.h" #include "nsString.h" #include "nsVoidArray.h" -#include "nsIPtr.h" #include "nsHTMLIIDs.h" #include "nsIDOMStyleSheetCollection.h" #include "nsIDOMCSSStyleSheet.h" @@ -75,14 +74,6 @@ static NS_DEFINE_IID(kIDOMCSSStyleRuleCollectionIID, NS_IDOMCSSSTYLERULECOLLECTI static NS_DEFINE_IID(kIDOMStyleSheetCollectionIID, NS_IDOMSTYLESHEETCOLLECTION_IID); static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID); -NS_DEF_PTR(nsIHTMLContent); -NS_DEF_PTR(nsIContent); -NS_DEF_PTR(nsIStyleRule); -NS_DEF_PTR(nsICSSStyleRule); -NS_DEF_PTR(nsIURI); -NS_DEF_PTR(nsISupportsArray); -NS_DEF_PTR(nsICSSStyleSheet); - // ---------------------- // Rule hash key // @@ -1424,8 +1415,8 @@ CSSStyleSheetImpl::SetEnabled(PRBool aEnabled) NS_IMETHODIMP CSSStyleSheetImpl::GetParentSheet(nsIStyleSheet*& aParent) const { - NS_IF_ADDREF(mParent); aParent = mParent; + NS_IF_ADDREF(aParent); return NS_OK; } diff --git a/mozilla/content/html/style/src/nsHTMLAttributes.cpp b/mozilla/content/html/style/src/nsHTMLAttributes.cpp index 4cc44c09a2d..23b451d3cce 100644 --- a/mozilla/content/html/style/src/nsHTMLAttributes.cpp +++ b/mozilla/content/html/style/src/nsHTMLAttributes.cpp @@ -1314,8 +1314,8 @@ HTMLAttributesImpl::GetAttributeCount(PRInt32& aCount) const NS_IMETHODIMP HTMLAttributesImpl::GetID(nsIAtom*& aResult) const { - NS_IF_ADDREF(mID); aResult = mID; + NS_IF_ADDREF(aResult); return NS_OK; } diff --git a/mozilla/content/html/style/src/nsHTMLValue.h b/mozilla/content/html/style/src/nsHTMLValue.h index 77da67483fe..39d5cd557ce 100644 --- a/mozilla/content/html/style/src/nsHTMLValue.h +++ b/mozilla/content/html/style/src/nsHTMLValue.h @@ -142,8 +142,9 @@ inline nsISupports* nsHTMLValue::GetISupportsValue(void) const { NS_ASSERTION(mUnit == eHTMLUnit_ISupports, "not an ISupports value"); if (mUnit == eHTMLUnit_ISupports) { - NS_IF_ADDREF(mValue.mISupports); - return mValue.mISupports; + nsISupports *result = mValue.mISupports; + NS_IF_ADDREF(result); + return result; } return nsnull; } diff --git a/mozilla/content/shared/public/nsHTMLValue.h b/mozilla/content/shared/public/nsHTMLValue.h index 77da67483fe..39d5cd557ce 100644 --- a/mozilla/content/shared/public/nsHTMLValue.h +++ b/mozilla/content/shared/public/nsHTMLValue.h @@ -142,8 +142,9 @@ inline nsISupports* nsHTMLValue::GetISupportsValue(void) const { NS_ASSERTION(mUnit == eHTMLUnit_ISupports, "not an ISupports value"); if (mUnit == eHTMLUnit_ISupports) { - NS_IF_ADDREF(mValue.mISupports); - return mValue.mISupports; + nsISupports *result = mValue.mISupports; + NS_IF_ADDREF(result); + return result; } return nsnull; } diff --git a/mozilla/layout/base/src/nsGenericElement.cpp b/mozilla/layout/base/src/nsGenericElement.cpp index 212e804b7b8..8366792124b 100644 --- a/mozilla/layout/base/src/nsGenericElement.cpp +++ b/mozilla/layout/base/src/nsGenericElement.cpp @@ -962,8 +962,8 @@ nsGenericElement::GetNameSpaceID(PRInt32& aResult) const nsresult nsGenericElement::GetTag(nsIAtom*& aResult) const { - NS_IF_ADDREF(mTag); aResult = mTag; + NS_IF_ADDREF(aResult); return NS_OK; } diff --git a/mozilla/layout/base/src/nsStyleContext.cpp b/mozilla/layout/base/src/nsStyleContext.cpp index 92bc7178239..d73e1b6fcaf 100644 --- a/mozilla/layout/base/src/nsStyleContext.cpp +++ b/mozilla/layout/base/src/nsStyleContext.cpp @@ -1847,8 +1847,9 @@ void StyleContextImpl::RemoveChild(StyleContextImpl* aChild) nsISupportsArray* StyleContextImpl::GetStyleRules(void) const { - NS_IF_ADDREF(mRules); - return mRules; + nsISupportsArray* result = mRules; + NS_IF_ADDREF(result); + return result; } PRInt32 StyleContextImpl::GetStyleRuleCount(void) const diff --git a/mozilla/layout/generic/nsFrame.cpp b/mozilla/layout/generic/nsFrame.cpp index ac427fcfe21..d415b545e1e 100644 --- a/mozilla/layout/generic/nsFrame.cpp +++ b/mozilla/layout/generic/nsFrame.cpp @@ -417,8 +417,8 @@ NS_IMETHODIMP nsFrame::GetContent(nsIContent** aContent) const { NS_PRECONDITION(nsnull != aContent, "null OUT parameter pointer"); - NS_IF_ADDREF(mContent); *aContent = mContent; + NS_IF_ADDREF(*aContent); return NS_OK; } diff --git a/mozilla/layout/html/base/src/nsFrame.cpp b/mozilla/layout/html/base/src/nsFrame.cpp index ac427fcfe21..d415b545e1e 100644 --- a/mozilla/layout/html/base/src/nsFrame.cpp +++ b/mozilla/layout/html/base/src/nsFrame.cpp @@ -417,8 +417,8 @@ NS_IMETHODIMP nsFrame::GetContent(nsIContent** aContent) const { NS_PRECONDITION(nsnull != aContent, "null OUT parameter pointer"); - NS_IF_ADDREF(mContent); *aContent = mContent; + NS_IF_ADDREF(*aContent); return NS_OK; } diff --git a/mozilla/layout/html/style/src/nsCSSStyleRule.cpp b/mozilla/layout/html/style/src/nsCSSStyleRule.cpp index 41c14beff65..23cb3fef91d 100644 --- a/mozilla/layout/html/style/src/nsCSSStyleRule.cpp +++ b/mozilla/layout/html/style/src/nsCSSStyleRule.cpp @@ -982,8 +982,9 @@ void CSSStyleRuleImpl::GetSourceSelectorText(nsString& aSelectorText) const nsICSSDeclaration* CSSStyleRuleImpl::GetDeclaration(void) const { - NS_IF_ADDREF(mDeclaration); - return mDeclaration; + nsICSSDeclaration* result = mDeclaration; + NS_IF_ADDREF(result); + return result; } void CSSStyleRuleImpl::SetDeclaration(nsICSSDeclaration* aDeclaration) diff --git a/mozilla/layout/html/style/src/nsCSSStyleSheet.cpp b/mozilla/layout/html/style/src/nsCSSStyleSheet.cpp index 5fc553b13e7..727885b6cbf 100644 --- a/mozilla/layout/html/style/src/nsCSSStyleSheet.cpp +++ b/mozilla/layout/html/style/src/nsCSSStyleSheet.cpp @@ -47,7 +47,6 @@ static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); #include "nsIFrame.h" #include "nsString.h" #include "nsVoidArray.h" -#include "nsIPtr.h" #include "nsHTMLIIDs.h" #include "nsIDOMStyleSheetCollection.h" #include "nsIDOMCSSStyleSheet.h" @@ -75,14 +74,6 @@ static NS_DEFINE_IID(kIDOMCSSStyleRuleCollectionIID, NS_IDOMCSSSTYLERULECOLLECTI static NS_DEFINE_IID(kIDOMStyleSheetCollectionIID, NS_IDOMSTYLESHEETCOLLECTION_IID); static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID); -NS_DEF_PTR(nsIHTMLContent); -NS_DEF_PTR(nsIContent); -NS_DEF_PTR(nsIStyleRule); -NS_DEF_PTR(nsICSSStyleRule); -NS_DEF_PTR(nsIURI); -NS_DEF_PTR(nsISupportsArray); -NS_DEF_PTR(nsICSSStyleSheet); - // ---------------------- // Rule hash key // @@ -1424,8 +1415,8 @@ CSSStyleSheetImpl::SetEnabled(PRBool aEnabled) NS_IMETHODIMP CSSStyleSheetImpl::GetParentSheet(nsIStyleSheet*& aParent) const { - NS_IF_ADDREF(mParent); aParent = mParent; + NS_IF_ADDREF(aParent); return NS_OK; } diff --git a/mozilla/layout/html/style/src/nsHTMLAttributes.cpp b/mozilla/layout/html/style/src/nsHTMLAttributes.cpp index 4cc44c09a2d..23b451d3cce 100644 --- a/mozilla/layout/html/style/src/nsHTMLAttributes.cpp +++ b/mozilla/layout/html/style/src/nsHTMLAttributes.cpp @@ -1314,8 +1314,8 @@ HTMLAttributesImpl::GetAttributeCount(PRInt32& aCount) const NS_IMETHODIMP HTMLAttributesImpl::GetID(nsIAtom*& aResult) const { - NS_IF_ADDREF(mID); aResult = mID; + NS_IF_ADDREF(aResult); return NS_OK; } diff --git a/mozilla/layout/html/style/src/nsHTMLValue.h b/mozilla/layout/html/style/src/nsHTMLValue.h index 77da67483fe..39d5cd557ce 100644 --- a/mozilla/layout/html/style/src/nsHTMLValue.h +++ b/mozilla/layout/html/style/src/nsHTMLValue.h @@ -142,8 +142,9 @@ inline nsISupports* nsHTMLValue::GetISupportsValue(void) const { NS_ASSERTION(mUnit == eHTMLUnit_ISupports, "not an ISupports value"); if (mUnit == eHTMLUnit_ISupports) { - NS_IF_ADDREF(mValue.mISupports); - return mValue.mISupports; + nsISupports *result = mValue.mISupports; + NS_IF_ADDREF(result); + return result; } return nsnull; } diff --git a/mozilla/layout/html/table/src/FixedTableLayoutStrategy.cpp b/mozilla/layout/html/table/src/FixedTableLayoutStrategy.cpp index 3fc87e1aff6..3ed6ebd863d 100644 --- a/mozilla/layout/html/table/src/FixedTableLayoutStrategy.cpp +++ b/mozilla/layout/html/table/src/FixedTableLayoutStrategy.cpp @@ -26,11 +26,8 @@ #include "nsIStyleContext.h" #include "nsStyleConsts.h" #include "nsVoidArray.h" -#include "nsIPtr.h" #include "nsHTMLIIDs.h" -NS_DEF_PTR(nsIStyleContext); - FixedTableLayoutStrategy::FixedTableLayoutStrategy(nsTableFrame *aFrame) : BasicTableLayoutStrategy(aFrame) { diff --git a/mozilla/layout/html/table/src/nsTableCellFrame.cpp b/mozilla/layout/html/table/src/nsTableCellFrame.cpp index 9a33b1e830c..7bbdf22f61c 100644 --- a/mozilla/layout/html/table/src/nsTableCellFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableCellFrame.cpp @@ -38,7 +38,6 @@ #include "nsHTMLAtoms.h" #include "nsHTMLIIDs.h" #include "nsVoidArray.h" -#include "nsIPtr.h" #include "nsIView.h" #include "nsStyleUtil.h" #include "nsLayoutAtoms.h" @@ -48,7 +47,6 @@ #include "nsIHTMLTableCellElement.h" #include "nsIDOMHTMLTableCellElement.h" -NS_DEF_PTR(nsIStyleContext); static NS_DEFINE_IID(kIHTMLTableCellElementIID, NS_IHTMLTABLECELLELEMENT_IID); static NS_DEFINE_IID(kIDOMHTMLTableCellElementIID, NS_IDOMHTMLTABLECELLELEMENT_IID); diff --git a/mozilla/layout/html/table/src/nsTableColGroupFrame.cpp b/mozilla/layout/html/table/src/nsTableColGroupFrame.cpp index 7e2f10224bf..33b366d7310 100644 --- a/mozilla/layout/html/table/src/nsTableColGroupFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableColGroupFrame.cpp @@ -30,7 +30,6 @@ #include "nsIPresContext.h" #include "nsIHTMLContent.h" #include "nsHTMLParts.h" -#include "nsIPtr.h" #include "nsHTMLAtoms.h" #include "nsHTMLIIDs.h" #include "nsCOMPtr.h" @@ -38,8 +37,6 @@ #include "nsIPresShell.h" #include "nsLayoutAtoms.h" -NS_DEF_PTR(nsIContent); - static NS_DEFINE_IID(kIHTMLTableColElementIID, NS_IHTMLTABLECOLELEMENT_IID); static NS_DEFINE_IID(kIDOMHTMLTableColElementIID, NS_IDOMHTMLTABLECOLELEMENT_IID); diff --git a/mozilla/layout/html/table/src/nsTableFrame.cpp b/mozilla/layout/html/table/src/nsTableFrame.cpp index fa1f1d8cf13..fa038119cb5 100644 --- a/mozilla/layout/html/table/src/nsTableFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableFrame.cpp @@ -45,7 +45,6 @@ #include "nsCSSRendering.h" #include "nsStyleConsts.h" #include "nsVoidArray.h" -#include "nsIPtr.h" #include "nsIView.h" #include "nsHTMLAtoms.h" #include "nsHTMLIIDs.h" @@ -61,9 +60,6 @@ #include "nsIScrollableFrame.h" #include "nsHTMLReflowCommand.h" -NS_DEF_PTR(nsIStyleContext); -NS_DEF_PTR(nsIContent); - static NS_DEFINE_IID(kIHTMLElementIID, NS_IDOMHTMLELEMENT_IID); static NS_DEFINE_IID(kIBodyElementIID, NS_IDOMHTMLBODYELEMENT_IID); static NS_DEFINE_IID(kITableRowGroupFrameIID, NS_ITABLEROWGROUPFRAME_IID); diff --git a/mozilla/layout/html/table/src/nsTableRowFrame.cpp b/mozilla/layout/html/table/src/nsTableRowFrame.cpp index e52f188568a..e5e41952592 100644 --- a/mozilla/layout/html/table/src/nsTableRowFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableRowFrame.cpp @@ -31,7 +31,6 @@ #include "nsTableFrame.h" #include "nsTableCellFrame.h" #include "nsIView.h" -#include "nsIPtr.h" #include "nsIReflowCommand.h" #include "nsCSSRendering.h" #include "nsHTMLIIDs.h" @@ -45,8 +44,6 @@ static NS_DEFINE_IID(kIHTMLTableCellElementIID, NS_IHTMLTABLECELLELEMENT_IID); // end includes for style optimizations that require real content knowledge -NS_DEF_PTR(nsIStyleContext); - /* ----------- nsTableRowpFrame ---------- */ diff --git a/mozilla/layout/html/table/src/nsTableRowGroupFrame.cpp b/mozilla/layout/html/table/src/nsTableRowGroupFrame.cpp index 3d9698e1f7e..84a784c40b8 100644 --- a/mozilla/layout/html/table/src/nsTableRowGroupFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableRowGroupFrame.cpp @@ -30,7 +30,6 @@ #include "nsStyleConsts.h" #include "nsIContent.h" #include "nsIView.h" -#include "nsIPtr.h" #include "nsIReflowCommand.h" #include "nsHTMLIIDs.h" #include "nsIDeviceContext.h" @@ -41,9 +40,6 @@ #include "nsCSSRendering.h" #include "nsHTMLParts.h" -NS_DEF_PTR(nsIStyleContext); -NS_DEF_PTR(nsIContent); - /* ----------- nsTableRowGroupFrame ---------- */ nsresult diff --git a/mozilla/layout/style/nsCSSStyleRule.cpp b/mozilla/layout/style/nsCSSStyleRule.cpp index 41c14beff65..23cb3fef91d 100644 --- a/mozilla/layout/style/nsCSSStyleRule.cpp +++ b/mozilla/layout/style/nsCSSStyleRule.cpp @@ -982,8 +982,9 @@ void CSSStyleRuleImpl::GetSourceSelectorText(nsString& aSelectorText) const nsICSSDeclaration* CSSStyleRuleImpl::GetDeclaration(void) const { - NS_IF_ADDREF(mDeclaration); - return mDeclaration; + nsICSSDeclaration* result = mDeclaration; + NS_IF_ADDREF(result); + return result; } void CSSStyleRuleImpl::SetDeclaration(nsICSSDeclaration* aDeclaration) diff --git a/mozilla/layout/style/nsCSSStyleSheet.cpp b/mozilla/layout/style/nsCSSStyleSheet.cpp index 5fc553b13e7..727885b6cbf 100644 --- a/mozilla/layout/style/nsCSSStyleSheet.cpp +++ b/mozilla/layout/style/nsCSSStyleSheet.cpp @@ -47,7 +47,6 @@ static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); #include "nsIFrame.h" #include "nsString.h" #include "nsVoidArray.h" -#include "nsIPtr.h" #include "nsHTMLIIDs.h" #include "nsIDOMStyleSheetCollection.h" #include "nsIDOMCSSStyleSheet.h" @@ -75,14 +74,6 @@ static NS_DEFINE_IID(kIDOMCSSStyleRuleCollectionIID, NS_IDOMCSSSTYLERULECOLLECTI static NS_DEFINE_IID(kIDOMStyleSheetCollectionIID, NS_IDOMSTYLESHEETCOLLECTION_IID); static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID); -NS_DEF_PTR(nsIHTMLContent); -NS_DEF_PTR(nsIContent); -NS_DEF_PTR(nsIStyleRule); -NS_DEF_PTR(nsICSSStyleRule); -NS_DEF_PTR(nsIURI); -NS_DEF_PTR(nsISupportsArray); -NS_DEF_PTR(nsICSSStyleSheet); - // ---------------------- // Rule hash key // @@ -1424,8 +1415,8 @@ CSSStyleSheetImpl::SetEnabled(PRBool aEnabled) NS_IMETHODIMP CSSStyleSheetImpl::GetParentSheet(nsIStyleSheet*& aParent) const { - NS_IF_ADDREF(mParent); aParent = mParent; + NS_IF_ADDREF(aParent); return NS_OK; } diff --git a/mozilla/layout/style/nsStyleContext.cpp b/mozilla/layout/style/nsStyleContext.cpp index 92bc7178239..d73e1b6fcaf 100644 --- a/mozilla/layout/style/nsStyleContext.cpp +++ b/mozilla/layout/style/nsStyleContext.cpp @@ -1847,8 +1847,9 @@ void StyleContextImpl::RemoveChild(StyleContextImpl* aChild) nsISupportsArray* StyleContextImpl::GetStyleRules(void) const { - NS_IF_ADDREF(mRules); - return mRules; + nsISupportsArray* result = mRules; + NS_IF_ADDREF(result); + return result; } PRInt32 StyleContextImpl::GetStyleRuleCount(void) const diff --git a/mozilla/layout/tables/FixedTableLayoutStrategy.cpp b/mozilla/layout/tables/FixedTableLayoutStrategy.cpp index 3fc87e1aff6..3ed6ebd863d 100644 --- a/mozilla/layout/tables/FixedTableLayoutStrategy.cpp +++ b/mozilla/layout/tables/FixedTableLayoutStrategy.cpp @@ -26,11 +26,8 @@ #include "nsIStyleContext.h" #include "nsStyleConsts.h" #include "nsVoidArray.h" -#include "nsIPtr.h" #include "nsHTMLIIDs.h" -NS_DEF_PTR(nsIStyleContext); - FixedTableLayoutStrategy::FixedTableLayoutStrategy(nsTableFrame *aFrame) : BasicTableLayoutStrategy(aFrame) { diff --git a/mozilla/layout/tables/nsTableCellFrame.cpp b/mozilla/layout/tables/nsTableCellFrame.cpp index 9a33b1e830c..7bbdf22f61c 100644 --- a/mozilla/layout/tables/nsTableCellFrame.cpp +++ b/mozilla/layout/tables/nsTableCellFrame.cpp @@ -38,7 +38,6 @@ #include "nsHTMLAtoms.h" #include "nsHTMLIIDs.h" #include "nsVoidArray.h" -#include "nsIPtr.h" #include "nsIView.h" #include "nsStyleUtil.h" #include "nsLayoutAtoms.h" @@ -48,7 +47,6 @@ #include "nsIHTMLTableCellElement.h" #include "nsIDOMHTMLTableCellElement.h" -NS_DEF_PTR(nsIStyleContext); static NS_DEFINE_IID(kIHTMLTableCellElementIID, NS_IHTMLTABLECELLELEMENT_IID); static NS_DEFINE_IID(kIDOMHTMLTableCellElementIID, NS_IDOMHTMLTABLECELLELEMENT_IID); diff --git a/mozilla/layout/tables/nsTableColGroupFrame.cpp b/mozilla/layout/tables/nsTableColGroupFrame.cpp index 7e2f10224bf..33b366d7310 100644 --- a/mozilla/layout/tables/nsTableColGroupFrame.cpp +++ b/mozilla/layout/tables/nsTableColGroupFrame.cpp @@ -30,7 +30,6 @@ #include "nsIPresContext.h" #include "nsIHTMLContent.h" #include "nsHTMLParts.h" -#include "nsIPtr.h" #include "nsHTMLAtoms.h" #include "nsHTMLIIDs.h" #include "nsCOMPtr.h" @@ -38,8 +37,6 @@ #include "nsIPresShell.h" #include "nsLayoutAtoms.h" -NS_DEF_PTR(nsIContent); - static NS_DEFINE_IID(kIHTMLTableColElementIID, NS_IHTMLTABLECOLELEMENT_IID); static NS_DEFINE_IID(kIDOMHTMLTableColElementIID, NS_IDOMHTMLTABLECOLELEMENT_IID); diff --git a/mozilla/layout/tables/nsTableFrame.cpp b/mozilla/layout/tables/nsTableFrame.cpp index fa1f1d8cf13..fa038119cb5 100644 --- a/mozilla/layout/tables/nsTableFrame.cpp +++ b/mozilla/layout/tables/nsTableFrame.cpp @@ -45,7 +45,6 @@ #include "nsCSSRendering.h" #include "nsStyleConsts.h" #include "nsVoidArray.h" -#include "nsIPtr.h" #include "nsIView.h" #include "nsHTMLAtoms.h" #include "nsHTMLIIDs.h" @@ -61,9 +60,6 @@ #include "nsIScrollableFrame.h" #include "nsHTMLReflowCommand.h" -NS_DEF_PTR(nsIStyleContext); -NS_DEF_PTR(nsIContent); - static NS_DEFINE_IID(kIHTMLElementIID, NS_IDOMHTMLELEMENT_IID); static NS_DEFINE_IID(kIBodyElementIID, NS_IDOMHTMLBODYELEMENT_IID); static NS_DEFINE_IID(kITableRowGroupFrameIID, NS_ITABLEROWGROUPFRAME_IID); diff --git a/mozilla/layout/tables/nsTableRowFrame.cpp b/mozilla/layout/tables/nsTableRowFrame.cpp index e52f188568a..e5e41952592 100644 --- a/mozilla/layout/tables/nsTableRowFrame.cpp +++ b/mozilla/layout/tables/nsTableRowFrame.cpp @@ -31,7 +31,6 @@ #include "nsTableFrame.h" #include "nsTableCellFrame.h" #include "nsIView.h" -#include "nsIPtr.h" #include "nsIReflowCommand.h" #include "nsCSSRendering.h" #include "nsHTMLIIDs.h" @@ -45,8 +44,6 @@ static NS_DEFINE_IID(kIHTMLTableCellElementIID, NS_IHTMLTABLECELLELEMENT_IID); // end includes for style optimizations that require real content knowledge -NS_DEF_PTR(nsIStyleContext); - /* ----------- nsTableRowpFrame ---------- */ diff --git a/mozilla/layout/tables/nsTableRowGroupFrame.cpp b/mozilla/layout/tables/nsTableRowGroupFrame.cpp index 3d9698e1f7e..84a784c40b8 100644 --- a/mozilla/layout/tables/nsTableRowGroupFrame.cpp +++ b/mozilla/layout/tables/nsTableRowGroupFrame.cpp @@ -30,7 +30,6 @@ #include "nsStyleConsts.h" #include "nsIContent.h" #include "nsIView.h" -#include "nsIPtr.h" #include "nsIReflowCommand.h" #include "nsHTMLIIDs.h" #include "nsIDeviceContext.h" @@ -41,9 +40,6 @@ #include "nsCSSRendering.h" #include "nsHTMLParts.h" -NS_DEF_PTR(nsIStyleContext); -NS_DEF_PTR(nsIContent); - /* ----------- nsTableRowGroupFrame ---------- */ nsresult diff --git a/mozilla/layout/xml/content/src/nsGenericXMLElement.cpp b/mozilla/layout/xml/content/src/nsGenericXMLElement.cpp index 1658518ce6c..1741d95bd2f 100644 --- a/mozilla/layout/xml/content/src/nsGenericXMLElement.cpp +++ b/mozilla/layout/xml/content/src/nsGenericXMLElement.cpp @@ -176,8 +176,7 @@ nsresult nsGenericXMLElement::GetNameSpacePrefix(nsIAtom*& aNameSpacePrefix) const { aNameSpacePrefix = mNameSpacePrefix; - - NS_IF_ADDREF(mNameSpacePrefix); + NS_IF_ADDREF(aNameSpacePrefix); return NS_OK; } @@ -214,8 +213,7 @@ nsresult nsGenericXMLElement::GetContainingNameSpace(nsINameSpace*& aNameSpace) const { aNameSpace = mNameSpace; - - NS_IF_ADDREF(mNameSpace); + NS_IF_ADDREF(aNameSpace); return NS_OK; } diff --git a/mozilla/layout/xul/base/src/nsTreeOuterFrame.h b/mozilla/layout/xul/base/src/nsTreeOuterFrame.h index fbb186e40ea..048bd7da826 100644 --- a/mozilla/layout/xul/base/src/nsTreeOuterFrame.h +++ b/mozilla/layout/xul/base/src/nsTreeOuterFrame.h @@ -25,7 +25,7 @@ #include "nsISelfScrollingFrame.h" #include "nsITreeFrame.h" -class nsTreeOuterFrame : public nsTableOuterFrame, nsISelfScrollingFrame +class nsTreeOuterFrame : public nsTableOuterFrame, public nsISelfScrollingFrame { public: friend nsresult NS_NewTreeOuterFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame); diff --git a/mozilla/xpfe/appshell/src/nsJSXPConnectFactory.cpp b/mozilla/xpfe/appshell/src/nsJSXPConnectFactory.cpp index 658f6980da6..3c2ad50a320 100644 --- a/mozilla/xpfe/appshell/src/nsJSXPConnectFactory.cpp +++ b/mozilla/xpfe/appshell/src/nsJSXPConnectFactory.cpp @@ -28,7 +28,6 @@ #include "nsIJSScriptObject.h" #include "nsIScriptObjectOwner.h" #include "nsIScriptGlobalObject.h" -#include "nsIPtr.h" #include "nsString.h" #include "nsIDOMXPConnectFactory.h" @@ -36,8 +35,6 @@ static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID); static NS_DEFINE_IID(kIJSScriptObjectIID, NS_IJSSCRIPTOBJECT_IID); static NS_DEFINE_IID(kIScriptGlobalObjectIID, NS_ISCRIPTGLOBALOBJECT_IID); static NS_DEFINE_IID(kIXPConnectFactoryIID, NS_IDOMXPCONNECTFACTORY_IID); -NS_DEF_PTR(nsIDOMXPConnectFactory); - /***********************************************************************/ // diff --git a/mozilla/xpinstall/public/nsIDOMInstallVersion.h b/mozilla/xpinstall/public/nsIDOMInstallVersion.h index 5a661bf519f..bab2fe19389 100644 --- a/mozilla/xpinstall/public/nsIDOMInstallVersion.h +++ b/mozilla/xpinstall/public/nsIDOMInstallVersion.h @@ -36,7 +36,7 @@ class nsIDOMInstallVersion; class nsIDOMInstallVersion : public nsISupports { public: - static const nsIID& IID() { static nsIID iid = NS_IDOMINSTALLVERSION_IID; return iid; } + static const nsIID& GetIID() { static nsIID iid = NS_IDOMINSTALLVERSION_IID; return iid; } enum { EQUAL = 0, BLD_DIFF = 1, diff --git a/mozilla/xpinstall/src/nsJSInstallTriggerGlobal.cpp b/mozilla/xpinstall/src/nsJSInstallTriggerGlobal.cpp index ea5cb3fbb18..8e4a709c918 100644 --- a/mozilla/xpinstall/src/nsJSInstallTriggerGlobal.cpp +++ b/mozilla/xpinstall/src/nsJSInstallTriggerGlobal.cpp @@ -27,7 +27,6 @@ #include "nsIJSScriptObject.h" #include "nsIScriptObjectOwner.h" #include "nsIScriptGlobalObject.h" -#include "nsIPtr.h" #include "nsCRT.h" #include "nsString.h" #include "nsIDOMInstallVersion.h" @@ -61,8 +60,6 @@ static NS_DEFINE_IID(kIJSScriptObjectIID, NS_IJSSCRIPTOBJECT_IID); static NS_DEFINE_IID(kIScriptGlobalObjectIID, NS_ISCRIPTGLOBALOBJECT_IID); static NS_DEFINE_IID(kIInstallTriggerGlobalIID, NS_IDOMINSTALLTRIGGERGLOBAL_IID); -NS_DEF_PTR(nsIDOMInstallTriggerGlobal); - // // InstallTriggerGlobal finalizer // diff --git a/mozilla/xpinstall/src/nsJSInstallVersion.cpp b/mozilla/xpinstall/src/nsJSInstallVersion.cpp index ba2f401e5ac..530f62c9bf0 100644 --- a/mozilla/xpinstall/src/nsJSInstallVersion.cpp +++ b/mozilla/xpinstall/src/nsJSInstallVersion.cpp @@ -28,7 +28,6 @@ #include "nsIJSScriptObject.h" #include "nsIScriptObjectOwner.h" #include "nsIScriptGlobalObject.h" -#include "nsIPtr.h" #include "nsString.h" #include "nsIDOMInstallVersion.h" #include "nsIScriptNameSpaceManager.h" @@ -63,8 +62,6 @@ static NS_DEFINE_IID(kIJSScriptObjectIID, NS_IJSSCRIPTOBJECT_IID); static NS_DEFINE_IID(kIScriptGlobalObjectIID, NS_ISCRIPTGLOBALOBJECT_IID); static NS_DEFINE_IID(kIInstallVersionIID, NS_IDOMINSTALLVERSION_IID); -NS_DEF_PTR(nsIDOMInstallVersion); - // // InstallVersion property ids // @@ -348,7 +345,6 @@ InstallVersionCompareTo(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, j PRInt32 b1int; PRInt32 b2int; PRInt32 b3int; - nsIDOMInstallVersionPtr versionObj; *rval = JSVAL_NULL; @@ -403,7 +399,9 @@ InstallVersionCompareTo(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, j if(JSVAL_IS_OBJECT(argv[0])) { - if(JS_FALSE == ConvertJSValToObj((nsISupports **)&versionObj, + nsCOMPtr versionObj; + + if(JS_FALSE == ConvertJSValToObj(getter_AddRefs(versionObj), kIInstallVersionIID, "InstallVersion", cx,