Bug 576877 Part 3: De-virtualize methods in NameSpaceRule. r=bzbarsky

layout/style/NameSpaceRule.h

@@ -80,17 +80,17 @@ public:
   virtual PRInt32 GetType() const;
   virtual already_AddRefed<nsICSSRule> Clone() const;
 
-  NS_IMETHOD  GetPrefix(nsIAtom*& aPrefix) const;
-  NS_IMETHOD  SetPrefix(nsIAtom* aPrefix);
+  nsIAtom* GetPrefix() const { return mPrefix; }
+  void SetPrefix(nsIAtom* aPrefix) { mPrefix = aPrefix; }
 
-  NS_IMETHOD  GetURLSpec(nsString& aURLSpec) const;
-  NS_IMETHOD  SetURLSpec(const nsString& aURLSpec);
+  void GetURLSpec(nsString& aURLSpec) const { aURLSpec = mURLSpec; }
+  void SetURLSpec(const nsString& aURLSpec) { mURLSpec = aURLSpec; }
 
   // nsIDOMCSSRule interface
   NS_DECL_NSIDOMCSSRULE
 
 private:
-  nsIAtom*          mPrefix;
+  nsCOMPtr<nsIAtom> mPrefix;
   nsString          mURLSpec;
 };
 

layout/style/nsCSSRules.cpp

@@ -58,9 +58,7 @@
 #include "nsIDOMCSSCharsetRule.h"
 #include "nsIDOMCSSStyleDeclaration.h"
 #include "nsIMediaList.h"
-#include "nsIDOMMediaList.h"
 #include "nsICSSRuleList.h"
-#include "nsIDOMStyleSheet.h"
 #include "nsIDocument.h"
 #include "nsPresContext.h"
 
@@ -1247,12 +1245,10 @@ NameSpaceRule::NameSpaceRule(const NameSpaceRule& aCopy)
     mPrefix(aCopy.mPrefix),
     mURLSpec(aCopy.mURLSpec)
 {
-  NS_IF_ADDREF(mPrefix);
 }
 
 NameSpaceRule::~NameSpaceRule()
 {
-  NS_IF_RELEASE(mPrefix);
 }
 
 NS_IMPL_ADDREF(NameSpaceRule)
@@ -1310,37 +1306,6 @@ NameSpaceRule::Clone() const
   return clone.forget();
 }
 
-NS_IMETHODIMP
-NameSpaceRule::GetPrefix(nsIAtom*& aPrefix) const
-{
-  aPrefix = mPrefix;
-  NS_IF_ADDREF(aPrefix);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-NameSpaceRule::SetPrefix(nsIAtom* aPrefix)
-{
-  NS_IF_RELEASE(mPrefix);
-  mPrefix = aPrefix;
-  NS_IF_ADDREF(mPrefix);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-NameSpaceRule::GetURLSpec(nsString& aURLSpec) const
-{
-  aURLSpec = mURLSpec;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-NameSpaceRule::SetURLSpec(const nsString& aURLSpec)
-{
-  mURLSpec = aURLSpec;
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 NameSpaceRule::GetType(PRUint16* aType)
 {

layout/style/nsCSSStyleSheet.cpp

@@ -952,12 +952,10 @@ AddNamespaceRuleToMap(nsICSSRule* aRule, nsXMLNameSpaceMap* aMap)
 
   nsRefPtr<css::NameSpaceRule> nameSpaceRule = do_QueryObject(aRule);
 
-  nsCOMPtr<nsIAtom> prefix;
   nsAutoString  urlSpec;
-  nameSpaceRule->GetPrefix(*getter_AddRefs(prefix));
   nameSpaceRule->GetURLSpec(urlSpec);
 
-  aMap->AddPrefix(prefix, urlSpec);
+  aMap->AddPrefix(nameSpaceRule->GetPrefix(), urlSpec);
 }
 
 static PRBool