diff --git a/mozilla/content/html/style/src/nsCSSDeclaration.cpp b/mozilla/content/html/style/src/nsCSSDeclaration.cpp
index 1d91f30f890..945f4bb3114 100644
--- a/mozilla/content/html/style/src/nsCSSDeclaration.cpp
+++ b/mozilla/content/html/style/src/nsCSSDeclaration.cpp
@@ -2490,7 +2490,8 @@ NS_HTML nsresult
     return NS_ERROR_NULL_POINTER;
   }
 
-  CSSDeclarationImpl  *it = new CSSDeclarationImpl();
+  CSSDeclarationImpl  *it;
+  NS_NEWXPCOM(it, CSSDeclarationImpl);
 
   if (nsnull == it) {
     return NS_ERROR_OUT_OF_MEMORY;
diff --git a/mozilla/content/html/style/src/nsCSSParser.cpp b/mozilla/content/html/style/src/nsCSSParser.cpp
index 483b09bc876..f4d61344e30 100644
--- a/mozilla/content/html/style/src/nsCSSParser.cpp
+++ b/mozilla/content/html/style/src/nsCSSParser.cpp
@@ -321,7 +321,7 @@ CSSParserImpl::CSSParserImpl(nsICSSStyleSheet* aSheet)
 {
   NS_INIT_REFCNT();
   mScanner = nsnull;
-  mSheet = aSheet; aSheet->AddRef();
+  mSheet = aSheet; NS_ADDREF(aSheet);
   mHavePushBack = PR_FALSE;
 }
 
@@ -375,9 +375,7 @@ CSSParserImpl::Parse(nsIUnicharInputStream* aInput,
   mScanner = new nsCSSScanner();
   mScanner->Init(aInput);
   mURL = aInputURL;
-  if (nsnull != aInputURL) {
-    aInputURL->AddRef();
-  }
+  NS_IF_ADDREF(aInputURL);
   mInHead = PR_TRUE;
   nsCSSToken* tk = &mToken;
   for (;;) {
@@ -443,6 +441,7 @@ CSSParserImpl::ParseDeclarations(const nsString& aDeclaration,
     rule->SetDeclaration(declaration);
     rule->SetWeight(0x7fffffff);
     aResult = rule;
+    NS_RELEASE(declaration);
   }
   else {
     aResult = nsnull;
diff --git a/mozilla/content/html/style/src/nsCSSScanner.cpp b/mozilla/content/html/style/src/nsCSSScanner.cpp
index 748460b1ab1..d89396faab8 100644
--- a/mozilla/content/html/style/src/nsCSSScanner.cpp
+++ b/mozilla/content/html/style/src/nsCSSScanner.cpp
@@ -109,9 +109,7 @@ void nsCSSScanner::Init(nsIUnicharInputStream* aInput)
   NS_PRECONDITION(nsnull != aInput, kNullPointer);
   Close();
   mInput = aInput;
-  if (nsnull != aInput) {
-    aInput->AddRef();
-  }
+  NS_IF_ADDREF(aInput);
 }
 
 void nsCSSScanner::Close()
diff --git a/mozilla/content/html/style/src/nsCSSStruct.cpp b/mozilla/content/html/style/src/nsCSSStruct.cpp
index 1d91f30f890..945f4bb3114 100644
--- a/mozilla/content/html/style/src/nsCSSStruct.cpp
+++ b/mozilla/content/html/style/src/nsCSSStruct.cpp
@@ -2490,7 +2490,8 @@ NS_HTML nsresult
     return NS_ERROR_NULL_POINTER;
   }
 
-  CSSDeclarationImpl  *it = new CSSDeclarationImpl();
+  CSSDeclarationImpl  *it;
+  NS_NEWXPCOM(it, CSSDeclarationImpl);
 
   if (nsnull == it) {
     return NS_ERROR_OUT_OF_MEMORY;
diff --git a/mozilla/content/html/style/src/nsCSSStyleRule.cpp b/mozilla/content/html/style/src/nsCSSStyleRule.cpp
index fc26d528144..513e3babb3f 100644
--- a/mozilla/content/html/style/src/nsCSSStyleRule.cpp
+++ b/mozilla/content/html/style/src/nsCSSStyleRule.cpp
@@ -372,7 +372,7 @@ nsrefcnt CSSStyleRuleImpl::Release(void)
     fprintf(stdout, "%d Release CSSStyleRule\n", mRefCnt - 1);
   }
   if (--mRefCnt == 0) {                                
-    delete this;                                       
+    NS_DELETEXPCOM(this);
     return 0;                                          
   }                                                    
   return mRefCnt;                                      
@@ -392,17 +392,17 @@ nsresult CSSStyleRuleImpl::QueryInterface(const nsIID& aIID,
   static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
   if (aIID.Equals(kICSSStyleRuleIID)) {
     *aInstancePtrResult = (void*) ((nsICSSStyleRule*)this);
-    AddRef();
+    NS_ADDREF_THIS();
     return NS_OK;
   }
   if (aIID.Equals(kIStyleRuleIID)) {
     *aInstancePtrResult = (void*) ((nsIStyleRule*)this);
-    AddRef();
+    NS_ADDREF_THIS();
     return NS_OK;
   }
   if (aIID.Equals(kISupportsIID)) {
     *aInstancePtrResult = (void*) ((nsISupports*)this);
-    AddRef();
+    NS_ADDREF_THIS();
     return NS_OK;
   }
   return NS_NOINTERFACE;
diff --git a/mozilla/content/html/style/src/nsCSSStyleSheet.cpp b/mozilla/content/html/style/src/nsCSSStyleSheet.cpp
index b3473f649c0..f8839f4d77e 100644
--- a/mozilla/content/html/style/src/nsCSSStyleSheet.cpp
+++ b/mozilla/content/html/style/src/nsCSSStyleSheet.cpp
@@ -382,17 +382,17 @@ nsresult CSSStyleSheetImpl::QueryInterface(const nsIID& aIID,
   static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
   if (aIID.Equals(kICSSStyleSheetIID)) {
     *aInstancePtrResult = (void*) ((nsICSSStyleSheet*)this);
-    AddRef();
+    NS_ADDREF_THIS();
     return NS_OK;
   }
   if (aIID.Equals(kIStyleSheetIID)) {
     *aInstancePtrResult = (void*) ((nsIStyleSheet*)this);
-    AddRef();
+    NS_ADDREF_THIS();
     return NS_OK;
   }
   if (aIID.Equals(kISupportsIID)) {
     *aInstancePtrResult = (void*) ((nsISupports*)this);
-    AddRef();
+    NS_ADDREF_THIS();
     return NS_OK;
   }
   return NS_NOINTERFACE;
diff --git a/mozilla/content/html/style/src/nsHTMLAttributes.cpp b/mozilla/content/html/style/src/nsHTMLAttributes.cpp
index cb010bc1697..80321b0df46 100644
--- a/mozilla/content/html/style/src/nsHTMLAttributes.cpp
+++ b/mozilla/content/html/style/src/nsHTMLAttributes.cpp
@@ -375,17 +375,17 @@ nsresult HTMLAttributesImpl::QueryInterface(const nsIID& aIID,
   static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
   if (aIID.Equals(kIHTMLAttributesIID)) {
     *aInstancePtrResult = (void*) ((nsIHTMLAttributes*)this);
-    AddRef();
+    NS_ADDREF_THIS();
     return NS_OK;
   }
   if (aIID.Equals(kIStyleRuleIID)) {
     *aInstancePtrResult = (void*) ((nsIStyleRule*)this);
-    AddRef();
+    NS_ADDREF_THIS();
     return NS_OK;
   }
   if (aIID.Equals(kISupportsIID)) {
     *aInstancePtrResult = (void*) ((nsISupports*)(nsIHTMLAttributes*)this);
-    AddRef();
+    NS_ADDREF_THIS();
     return NS_OK;
   }
   return NS_NOINTERFACE;
diff --git a/mozilla/content/html/style/src/nsHTMLCSSStyleSheet.cpp b/mozilla/content/html/style/src/nsHTMLCSSStyleSheet.cpp
index 5b22ca42453..9a680065fb7 100644
--- a/mozilla/content/html/style/src/nsHTMLCSSStyleSheet.cpp
+++ b/mozilla/content/html/style/src/nsHTMLCSSStyleSheet.cpp
@@ -218,17 +218,17 @@ nsresult HTMLCSSStyleSheetImpl::QueryInterface(const nsIID& aIID,
   static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
   if (aIID.Equals(kIHTMLCSSStyleSheetIID)) {
     *aInstancePtrResult = (void*) ((nsIHTMLCSSStyleSheet*)this);
-    AddRef();
+    NS_ADDREF_THIS();
     return NS_OK;
   }
   if (aIID.Equals(kIStyleSheetIID)) {
     *aInstancePtrResult = (void*) ((nsIStyleSheet*)this);
-    AddRef();
+    NS_ADDREF_THIS();
     return NS_OK;
   }
   if (aIID.Equals(kISupportsIID)) {
     *aInstancePtrResult = (void*) ((nsISupports*)this);
-    AddRef();
+    NS_ADDREF_THIS();
     return NS_OK;
   }
   return NS_NOINTERFACE;
diff --git a/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp b/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp
index 3ebd4071768..7d9bb195ebb 100644
--- a/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp
+++ b/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp
@@ -406,22 +406,22 @@ nsresult HTMLStyleSheetImpl::QueryInterface(const nsIID& aIID,
   static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
   if (aIID.Equals(kIHTMLStyleSheetIID)) {
     *aInstancePtrResult = (void*) ((nsIHTMLStyleSheet*)this);
-    AddRef();
+    NS_ADDREF_THIS();
     return NS_OK;
   }
   if (aIID.Equals(kIStyleSheetIID)) {
     *aInstancePtrResult = (void*) ((nsIStyleSheet*)this);
-    AddRef();
+    NS_ADDREF_THIS();
     return NS_OK;
   }
   if (aIID.Equals(kIStyleFrameConstructionIID)) {
     *aInstancePtrResult = (void*) ((nsIStyleFrameConstruction*)this);
-    AddRef();
+    NS_ADDREF_THIS();
     return NS_OK;
   }
   if (aIID.Equals(kISupportsIID)) {
     *aInstancePtrResult = (void*) this;
-    AddRef();
+    NS_ADDREF_THIS();
     return NS_OK;
   }
   return NS_NOINTERFACE;
diff --git a/mozilla/layout/html/style/src/nsCSSDeclaration.cpp b/mozilla/layout/html/style/src/nsCSSDeclaration.cpp
index 1d91f30f890..945f4bb3114 100644
--- a/mozilla/layout/html/style/src/nsCSSDeclaration.cpp
+++ b/mozilla/layout/html/style/src/nsCSSDeclaration.cpp
@@ -2490,7 +2490,8 @@ NS_HTML nsresult
     return NS_ERROR_NULL_POINTER;
   }
 
-  CSSDeclarationImpl  *it = new CSSDeclarationImpl();
+  CSSDeclarationImpl  *it;
+  NS_NEWXPCOM(it, CSSDeclarationImpl);
 
   if (nsnull == it) {
     return NS_ERROR_OUT_OF_MEMORY;
diff --git a/mozilla/layout/html/style/src/nsCSSParser.cpp b/mozilla/layout/html/style/src/nsCSSParser.cpp
index 483b09bc876..f4d61344e30 100644
--- a/mozilla/layout/html/style/src/nsCSSParser.cpp
+++ b/mozilla/layout/html/style/src/nsCSSParser.cpp
@@ -321,7 +321,7 @@ CSSParserImpl::CSSParserImpl(nsICSSStyleSheet* aSheet)
 {
   NS_INIT_REFCNT();
   mScanner = nsnull;
-  mSheet = aSheet; aSheet->AddRef();
+  mSheet = aSheet; NS_ADDREF(aSheet);
   mHavePushBack = PR_FALSE;
 }
 
@@ -375,9 +375,7 @@ CSSParserImpl::Parse(nsIUnicharInputStream* aInput,
   mScanner = new nsCSSScanner();
   mScanner->Init(aInput);
   mURL = aInputURL;
-  if (nsnull != aInputURL) {
-    aInputURL->AddRef();
-  }
+  NS_IF_ADDREF(aInputURL);
   mInHead = PR_TRUE;
   nsCSSToken* tk = &mToken;
   for (;;) {
@@ -443,6 +441,7 @@ CSSParserImpl::ParseDeclarations(const nsString& aDeclaration,
     rule->SetDeclaration(declaration);
     rule->SetWeight(0x7fffffff);
     aResult = rule;
+    NS_RELEASE(declaration);
   }
   else {
     aResult = nsnull;
diff --git a/mozilla/layout/html/style/src/nsCSSScanner.cpp b/mozilla/layout/html/style/src/nsCSSScanner.cpp
index 748460b1ab1..d89396faab8 100644
--- a/mozilla/layout/html/style/src/nsCSSScanner.cpp
+++ b/mozilla/layout/html/style/src/nsCSSScanner.cpp
@@ -109,9 +109,7 @@ void nsCSSScanner::Init(nsIUnicharInputStream* aInput)
   NS_PRECONDITION(nsnull != aInput, kNullPointer);
   Close();
   mInput = aInput;
-  if (nsnull != aInput) {
-    aInput->AddRef();
-  }
+  NS_IF_ADDREF(aInput);
 }
 
 void nsCSSScanner::Close()
diff --git a/mozilla/layout/html/style/src/nsCSSStyleRule.cpp b/mozilla/layout/html/style/src/nsCSSStyleRule.cpp
index fc26d528144..513e3babb3f 100644
--- a/mozilla/layout/html/style/src/nsCSSStyleRule.cpp
+++ b/mozilla/layout/html/style/src/nsCSSStyleRule.cpp
@@ -372,7 +372,7 @@ nsrefcnt CSSStyleRuleImpl::Release(void)
     fprintf(stdout, "%d Release CSSStyleRule\n", mRefCnt - 1);
   }
   if (--mRefCnt == 0) {                                
-    delete this;                                       
+    NS_DELETEXPCOM(this);
     return 0;                                          
   }                                                    
   return mRefCnt;                                      
@@ -392,17 +392,17 @@ nsresult CSSStyleRuleImpl::QueryInterface(const nsIID& aIID,
   static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
   if (aIID.Equals(kICSSStyleRuleIID)) {
     *aInstancePtrResult = (void*) ((nsICSSStyleRule*)this);
-    AddRef();
+    NS_ADDREF_THIS();
     return NS_OK;
   }
   if (aIID.Equals(kIStyleRuleIID)) {
     *aInstancePtrResult = (void*) ((nsIStyleRule*)this);
-    AddRef();
+    NS_ADDREF_THIS();
     return NS_OK;
   }
   if (aIID.Equals(kISupportsIID)) {
     *aInstancePtrResult = (void*) ((nsISupports*)this);
-    AddRef();
+    NS_ADDREF_THIS();
     return NS_OK;
   }
   return NS_NOINTERFACE;
diff --git a/mozilla/layout/html/style/src/nsCSSStyleSheet.cpp b/mozilla/layout/html/style/src/nsCSSStyleSheet.cpp
index b3473f649c0..f8839f4d77e 100644
--- a/mozilla/layout/html/style/src/nsCSSStyleSheet.cpp
+++ b/mozilla/layout/html/style/src/nsCSSStyleSheet.cpp
@@ -382,17 +382,17 @@ nsresult CSSStyleSheetImpl::QueryInterface(const nsIID& aIID,
   static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
   if (aIID.Equals(kICSSStyleSheetIID)) {
     *aInstancePtrResult = (void*) ((nsICSSStyleSheet*)this);
-    AddRef();
+    NS_ADDREF_THIS();
     return NS_OK;
   }
   if (aIID.Equals(kIStyleSheetIID)) {
     *aInstancePtrResult = (void*) ((nsIStyleSheet*)this);
-    AddRef();
+    NS_ADDREF_THIS();
     return NS_OK;
   }
   if (aIID.Equals(kISupportsIID)) {
     *aInstancePtrResult = (void*) ((nsISupports*)this);
-    AddRef();
+    NS_ADDREF_THIS();
     return NS_OK;
   }
   return NS_NOINTERFACE;
diff --git a/mozilla/layout/html/style/src/nsHTMLAttributes.cpp b/mozilla/layout/html/style/src/nsHTMLAttributes.cpp
index cb010bc1697..80321b0df46 100644
--- a/mozilla/layout/html/style/src/nsHTMLAttributes.cpp
+++ b/mozilla/layout/html/style/src/nsHTMLAttributes.cpp
@@ -375,17 +375,17 @@ nsresult HTMLAttributesImpl::QueryInterface(const nsIID& aIID,
   static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
   if (aIID.Equals(kIHTMLAttributesIID)) {
     *aInstancePtrResult = (void*) ((nsIHTMLAttributes*)this);
-    AddRef();
+    NS_ADDREF_THIS();
     return NS_OK;
   }
   if (aIID.Equals(kIStyleRuleIID)) {
     *aInstancePtrResult = (void*) ((nsIStyleRule*)this);
-    AddRef();
+    NS_ADDREF_THIS();
     return NS_OK;
   }
   if (aIID.Equals(kISupportsIID)) {
     *aInstancePtrResult = (void*) ((nsISupports*)(nsIHTMLAttributes*)this);
-    AddRef();
+    NS_ADDREF_THIS();
     return NS_OK;
   }
   return NS_NOINTERFACE;
diff --git a/mozilla/layout/html/style/src/nsHTMLCSSStyleSheet.cpp b/mozilla/layout/html/style/src/nsHTMLCSSStyleSheet.cpp
index 5b22ca42453..9a680065fb7 100644
--- a/mozilla/layout/html/style/src/nsHTMLCSSStyleSheet.cpp
+++ b/mozilla/layout/html/style/src/nsHTMLCSSStyleSheet.cpp
@@ -218,17 +218,17 @@ nsresult HTMLCSSStyleSheetImpl::QueryInterface(const nsIID& aIID,
   static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
   if (aIID.Equals(kIHTMLCSSStyleSheetIID)) {
     *aInstancePtrResult = (void*) ((nsIHTMLCSSStyleSheet*)this);
-    AddRef();
+    NS_ADDREF_THIS();
     return NS_OK;
   }
   if (aIID.Equals(kIStyleSheetIID)) {
     *aInstancePtrResult = (void*) ((nsIStyleSheet*)this);
-    AddRef();
+    NS_ADDREF_THIS();
     return NS_OK;
   }
   if (aIID.Equals(kISupportsIID)) {
     *aInstancePtrResult = (void*) ((nsISupports*)this);
-    AddRef();
+    NS_ADDREF_THIS();
     return NS_OK;
   }
   return NS_NOINTERFACE;
diff --git a/mozilla/layout/html/style/src/nsHTMLStyleSheet.cpp b/mozilla/layout/html/style/src/nsHTMLStyleSheet.cpp
index 3ebd4071768..7d9bb195ebb 100644
--- a/mozilla/layout/html/style/src/nsHTMLStyleSheet.cpp
+++ b/mozilla/layout/html/style/src/nsHTMLStyleSheet.cpp
@@ -406,22 +406,22 @@ nsresult HTMLStyleSheetImpl::QueryInterface(const nsIID& aIID,
   static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
   if (aIID.Equals(kIHTMLStyleSheetIID)) {
     *aInstancePtrResult = (void*) ((nsIHTMLStyleSheet*)this);
-    AddRef();
+    NS_ADDREF_THIS();
     return NS_OK;
   }
   if (aIID.Equals(kIStyleSheetIID)) {
     *aInstancePtrResult = (void*) ((nsIStyleSheet*)this);
-    AddRef();
+    NS_ADDREF_THIS();
     return NS_OK;
   }
   if (aIID.Equals(kIStyleFrameConstructionIID)) {
     *aInstancePtrResult = (void*) ((nsIStyleFrameConstruction*)this);
-    AddRef();
+    NS_ADDREF_THIS();
     return NS_OK;
   }
   if (aIID.Equals(kISupportsIID)) {
     *aInstancePtrResult = (void*) this;
-    AddRef();
+    NS_ADDREF_THIS();
     return NS_OK;
   }
   return NS_NOINTERFACE;
diff --git a/mozilla/layout/style/nsCSSDeclaration.cpp b/mozilla/layout/style/nsCSSDeclaration.cpp
index 1d91f30f890..945f4bb3114 100644
--- a/mozilla/layout/style/nsCSSDeclaration.cpp
+++ b/mozilla/layout/style/nsCSSDeclaration.cpp
@@ -2490,7 +2490,8 @@ NS_HTML nsresult
     return NS_ERROR_NULL_POINTER;
   }
 
-  CSSDeclarationImpl  *it = new CSSDeclarationImpl();
+  CSSDeclarationImpl  *it;
+  NS_NEWXPCOM(it, CSSDeclarationImpl);
 
   if (nsnull == it) {
     return NS_ERROR_OUT_OF_MEMORY;
diff --git a/mozilla/layout/style/nsCSSParser.cpp b/mozilla/layout/style/nsCSSParser.cpp
index 483b09bc876..f4d61344e30 100644
--- a/mozilla/layout/style/nsCSSParser.cpp
+++ b/mozilla/layout/style/nsCSSParser.cpp
@@ -321,7 +321,7 @@ CSSParserImpl::CSSParserImpl(nsICSSStyleSheet* aSheet)
 {
   NS_INIT_REFCNT();
   mScanner = nsnull;
-  mSheet = aSheet; aSheet->AddRef();
+  mSheet = aSheet; NS_ADDREF(aSheet);
   mHavePushBack = PR_FALSE;
 }
 
@@ -375,9 +375,7 @@ CSSParserImpl::Parse(nsIUnicharInputStream* aInput,
   mScanner = new nsCSSScanner();
   mScanner->Init(aInput);
   mURL = aInputURL;
-  if (nsnull != aInputURL) {
-    aInputURL->AddRef();
-  }
+  NS_IF_ADDREF(aInputURL);
   mInHead = PR_TRUE;
   nsCSSToken* tk = &mToken;
   for (;;) {
@@ -443,6 +441,7 @@ CSSParserImpl::ParseDeclarations(const nsString& aDeclaration,
     rule->SetDeclaration(declaration);
     rule->SetWeight(0x7fffffff);
     aResult = rule;
+    NS_RELEASE(declaration);
   }
   else {
     aResult = nsnull;
diff --git a/mozilla/layout/style/nsCSSScanner.cpp b/mozilla/layout/style/nsCSSScanner.cpp
index 748460b1ab1..d89396faab8 100644
--- a/mozilla/layout/style/nsCSSScanner.cpp
+++ b/mozilla/layout/style/nsCSSScanner.cpp
@@ -109,9 +109,7 @@ void nsCSSScanner::Init(nsIUnicharInputStream* aInput)
   NS_PRECONDITION(nsnull != aInput, kNullPointer);
   Close();
   mInput = aInput;
-  if (nsnull != aInput) {
-    aInput->AddRef();
-  }
+  NS_IF_ADDREF(aInput);
 }
 
 void nsCSSScanner::Close()
diff --git a/mozilla/layout/style/nsCSSStruct.cpp b/mozilla/layout/style/nsCSSStruct.cpp
index 1d91f30f890..945f4bb3114 100644
--- a/mozilla/layout/style/nsCSSStruct.cpp
+++ b/mozilla/layout/style/nsCSSStruct.cpp
@@ -2490,7 +2490,8 @@ NS_HTML nsresult
     return NS_ERROR_NULL_POINTER;
   }
 
-  CSSDeclarationImpl  *it = new CSSDeclarationImpl();
+  CSSDeclarationImpl  *it;
+  NS_NEWXPCOM(it, CSSDeclarationImpl);
 
   if (nsnull == it) {
     return NS_ERROR_OUT_OF_MEMORY;
diff --git a/mozilla/layout/style/nsCSSStyleRule.cpp b/mozilla/layout/style/nsCSSStyleRule.cpp
index fc26d528144..513e3babb3f 100644
--- a/mozilla/layout/style/nsCSSStyleRule.cpp
+++ b/mozilla/layout/style/nsCSSStyleRule.cpp
@@ -372,7 +372,7 @@ nsrefcnt CSSStyleRuleImpl::Release(void)
     fprintf(stdout, "%d Release CSSStyleRule\n", mRefCnt - 1);
   }
   if (--mRefCnt == 0) {                                
-    delete this;                                       
+    NS_DELETEXPCOM(this);
     return 0;                                          
   }                                                    
   return mRefCnt;                                      
@@ -392,17 +392,17 @@ nsresult CSSStyleRuleImpl::QueryInterface(const nsIID& aIID,
   static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
   if (aIID.Equals(kICSSStyleRuleIID)) {
     *aInstancePtrResult = (void*) ((nsICSSStyleRule*)this);
-    AddRef();
+    NS_ADDREF_THIS();
     return NS_OK;
   }
   if (aIID.Equals(kIStyleRuleIID)) {
     *aInstancePtrResult = (void*) ((nsIStyleRule*)this);
-    AddRef();
+    NS_ADDREF_THIS();
     return NS_OK;
   }
   if (aIID.Equals(kISupportsIID)) {
     *aInstancePtrResult = (void*) ((nsISupports*)this);
-    AddRef();
+    NS_ADDREF_THIS();
     return NS_OK;
   }
   return NS_NOINTERFACE;
diff --git a/mozilla/layout/style/nsCSSStyleSheet.cpp b/mozilla/layout/style/nsCSSStyleSheet.cpp
index b3473f649c0..f8839f4d77e 100644
--- a/mozilla/layout/style/nsCSSStyleSheet.cpp
+++ b/mozilla/layout/style/nsCSSStyleSheet.cpp
@@ -382,17 +382,17 @@ nsresult CSSStyleSheetImpl::QueryInterface(const nsIID& aIID,
   static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
   if (aIID.Equals(kICSSStyleSheetIID)) {
     *aInstancePtrResult = (void*) ((nsICSSStyleSheet*)this);
-    AddRef();
+    NS_ADDREF_THIS();
     return NS_OK;
   }
   if (aIID.Equals(kIStyleSheetIID)) {
     *aInstancePtrResult = (void*) ((nsIStyleSheet*)this);
-    AddRef();
+    NS_ADDREF_THIS();
     return NS_OK;
   }
   if (aIID.Equals(kISupportsIID)) {
     *aInstancePtrResult = (void*) ((nsISupports*)this);
-    AddRef();
+    NS_ADDREF_THIS();
     return NS_OK;
   }
   return NS_NOINTERFACE;
diff --git a/mozilla/layout/style/nsHTMLCSSStyleSheet.cpp b/mozilla/layout/style/nsHTMLCSSStyleSheet.cpp
index 5b22ca42453..9a680065fb7 100644
--- a/mozilla/layout/style/nsHTMLCSSStyleSheet.cpp
+++ b/mozilla/layout/style/nsHTMLCSSStyleSheet.cpp
@@ -218,17 +218,17 @@ nsresult HTMLCSSStyleSheetImpl::QueryInterface(const nsIID& aIID,
   static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
   if (aIID.Equals(kIHTMLCSSStyleSheetIID)) {
     *aInstancePtrResult = (void*) ((nsIHTMLCSSStyleSheet*)this);
-    AddRef();
+    NS_ADDREF_THIS();
     return NS_OK;
   }
   if (aIID.Equals(kIStyleSheetIID)) {
     *aInstancePtrResult = (void*) ((nsIStyleSheet*)this);
-    AddRef();
+    NS_ADDREF_THIS();
     return NS_OK;
   }
   if (aIID.Equals(kISupportsIID)) {
     *aInstancePtrResult = (void*) ((nsISupports*)this);
-    AddRef();
+    NS_ADDREF_THIS();
     return NS_OK;
   }
   return NS_NOINTERFACE;
diff --git a/mozilla/layout/style/nsHTMLStyleSheet.cpp b/mozilla/layout/style/nsHTMLStyleSheet.cpp
index 3ebd4071768..7d9bb195ebb 100644
--- a/mozilla/layout/style/nsHTMLStyleSheet.cpp
+++ b/mozilla/layout/style/nsHTMLStyleSheet.cpp
@@ -406,22 +406,22 @@ nsresult HTMLStyleSheetImpl::QueryInterface(const nsIID& aIID,
   static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
   if (aIID.Equals(kIHTMLStyleSheetIID)) {
     *aInstancePtrResult = (void*) ((nsIHTMLStyleSheet*)this);
-    AddRef();
+    NS_ADDREF_THIS();
     return NS_OK;
   }
   if (aIID.Equals(kIStyleSheetIID)) {
     *aInstancePtrResult = (void*) ((nsIStyleSheet*)this);
-    AddRef();
+    NS_ADDREF_THIS();
     return NS_OK;
   }
   if (aIID.Equals(kIStyleFrameConstructionIID)) {
     *aInstancePtrResult = (void*) ((nsIStyleFrameConstruction*)this);
-    AddRef();
+    NS_ADDREF_THIS();
     return NS_OK;
   }
   if (aIID.Equals(kISupportsIID)) {
     *aInstancePtrResult = (void*) this;
-    AddRef();
+    NS_ADDREF_THIS();
     return NS_OK;
   }
   return NS_NOINTERFACE;