зеркало из https://github.com/mozilla/gecko-dev.git
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
This commit is contained in:
Родитель
ce4b39c289
Коммит
080142580c
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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 ---------- */
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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 ---------- */
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
||||
/***********************************************************************/
|
||||
//
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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
|
||||
//
|
||||
|
|
|
@ -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<nsIDOMInstallVersion> versionObj;
|
||||
|
||||
if(JS_FALSE == ConvertJSValToObj(getter_AddRefs(versionObj),
|
||||
kIInstallVersionIID,
|
||||
"InstallVersion",
|
||||
cx,
|
||||
|
|
Загрузка…
Ссылка в новой задаче