From 508c107c8fc872980e1f93dfcfbdc8de834fe927 Mon Sep 17 00:00:00 2001
From: Craig Topper <craig.topper@gmail.com>
Date: Tue, 22 Mar 2011 23:20:09 -0700
Subject: [PATCH] Bug 645956 - Part 5: Remove NS_NewCSSCharsetRule, r=bzbarsky

---
 layout/style/nsCSSParser.cpp |  8 ++------
 layout/style/nsCSSRules.cpp  | 23 -----------------------
 layout/style/nsICSSRule.h    |  6 ------
 3 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/layout/style/nsCSSParser.cpp b/layout/style/nsCSSParser.cpp
index a6f093b540d6..9bbfb91a25dc 100644
--- a/layout/style/nsCSSParser.cpp
+++ b/layout/style/nsCSSParser.cpp
@@ -1557,12 +1557,8 @@ CSSParserImpl::ParseCharsetRule(RuleAppendFunc aAppendFunc,
     return PR_FALSE;
   }
 
-  nsCOMPtr<nsICSSRule> rule;
-  NS_NewCSSCharsetRule(getter_AddRefs(rule), charset);
-
-  if (rule) {
-    (*aAppendFunc)(rule, aData);
-  }
+  nsCOMPtr<nsICSSRule> rule = new css::CharsetRule(charset);
+  (*aAppendFunc)(rule, aData);
 
   return PR_TRUE;
 }
diff --git a/layout/style/nsCSSRules.cpp b/layout/style/nsCSSRules.cpp
index 0061257a22aa..94ee85ffe081 100644
--- a/layout/style/nsCSSRules.cpp
+++ b/layout/style/nsCSSRules.cpp
@@ -325,35 +325,12 @@ CharsetRule::GetParentRule(nsIDOMCSSRule** aParentRule)
   return NS_OK;
 }
 
-} // namespace css
-} // namespace mozilla
-
-nsresult
-NS_NewCSSCharsetRule(nsICSSRule** aInstancePtrResult, const nsAString& aEncoding)
-{
-  if (! aInstancePtrResult) {
-    return NS_ERROR_NULL_POINTER;
-  }
-
-  css::CharsetRule* it = new css::CharsetRule(aEncoding);
-
-  if (!it) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-
-  NS_ADDREF(*aInstancePtrResult = it);
-  return NS_OK;
-}
-
 
 
 // -------------------------------------------
 // ImportRule
 //
 
-namespace mozilla {
-namespace css {
-
 ImportRule::ImportRule(nsMediaList* aMedia, const nsString& aURLSpec)
   : Rule()
   , mURLSpec(aURLSpec)
diff --git a/layout/style/nsICSSRule.h b/layout/style/nsICSSRule.h
index 3d0f5656d57b..7c040d785014 100644
--- a/layout/style/nsICSSRule.h
+++ b/layout/style/nsICSSRule.h
@@ -105,10 +105,4 @@ class nsICSSRule : public nsIStyleRule {
 
 NS_DEFINE_STATIC_IID_ACCESSOR(nsICSSRule, NS_ICSS_RULE_IID)
 
-/* Define global NS_New* functions for rules that don't need their own
-   interfaces here */
-nsresult
-NS_NewCSSCharsetRule(nsICSSRule** aInstancePtrResult,
-                     const nsAString& aEncoding);
-
 #endif /* nsICSSRule_h */