Backed out changeset 582c563a8e1a (bug 945587) for bustage on CLOSED TREE
authorEhsan Akhgari <ehsan@mozilla.com>
Tue, 03 Dec 2013 16:10:30 -0500
changeset 174305 38ddf36afa9d7c40745c7ba556c92099e9ef82a7
parent 174304 eadaf7446c64cd3947b2c8ab3555fa477d3ee714
child 174306 8dfe4e73db8ee85a82589d2ab1c84b51e2ba0368
push id445
push userffxbld
push dateMon, 10 Mar 2014 22:05:19 +0000
treeherdermozilla-release@dc38b741b04e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs945587
milestone28.0a1
backs out582c563a8e1a7fa3520fce76c31226aaeeabca7a
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 582c563a8e1a (bug 945587) for bustage on CLOSED TREE
content/xul/templates/src/nsXULContentUtils.cpp
content/xul/templates/src/nsXULTemplateBuilder.cpp
content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp
content/xul/templates/src/nsXULTemplateResultStorage.cpp
--- a/content/xul/templates/src/nsXULContentUtils.cpp
+++ b/content/xul/templates/src/nsXULContentUtils.cpp
@@ -56,16 +56,18 @@
 #include "nsCollationCID.h"
 #include "nsILocale.h"
 #include "nsILocaleService.h"
 #include "nsIConsoleService.h"
 #include "nsEscape.h"
 
 using namespace mozilla;
 
+static NS_DEFINE_CID(kRDFServiceCID,        NS_RDFSERVICE_CID);
+
 //------------------------------------------------------------------------
 
 nsIRDFService* nsXULContentUtils::gRDF;
 nsIDateTimeFormat* nsXULContentUtils::gFormat;
 nsICollation *nsXULContentUtils::gCollation;
 
 #ifdef PR_LOGGING
 extern PRLogModuleInfo* gXULTemplateLog;
@@ -79,17 +81,17 @@ extern PRLogModuleInfo* gXULTemplateLog;
 
 //------------------------------------------------------------------------
 // Constructors n' stuff
 //
 
 nsresult
 nsXULContentUtils::Init()
 {
-    nsresult rv = CallGetService(NS_RDFSERVICE_CID, &gRDF);
+    nsresult rv = CallGetService(kRDFServiceCID, &gRDF);
     if (NS_FAILED(rv)) {
         return rv;
     }
 
 #define XUL_RESOURCE(ident, uri)                              \
   PR_BEGIN_MACRO                                              \
    rv = gRDF->GetResource(NS_LITERAL_CSTRING(uri), &(ident)); \
    if (NS_FAILED(rv)) return rv;                              \
--- a/content/xul/templates/src/nsXULTemplateBuilder.cpp
+++ b/content/xul/templates/src/nsXULTemplateBuilder.cpp
@@ -137,17 +137,18 @@ nsXULTemplateBuilder::~nsXULTemplateBuil
 nsresult
 nsXULTemplateBuilder::InitGlobals()
 {
     nsresult rv;
 
     if (gRefCnt++ == 0) {
         // Initialize the global shared reference to the service
         // manager and get some shared resource objects.
-        rv = CallGetService(NS_RDFSERVICE_CID, &gRDFService);
+        NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
+        rv = CallGetService(kRDFServiceCID, &gRDFService);
         if (NS_FAILED(rv))
             return rv;
 
         NS_DEFINE_CID(kRDFContainerUtilsCID, NS_RDFCONTAINERUTILS_CID);
         rv = CallGetService(kRDFContainerUtilsCID, &gRDFContainerUtils);
         if (NS_FAILED(rv))
             return rv;
 
--- a/content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp
+++ b/content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp
@@ -137,17 +137,18 @@ nsXULTemplateQueryProcessorRDF::~nsXULTe
 nsresult
 nsXULTemplateQueryProcessorRDF::InitGlobals()
 {
     nsresult rv;
 
     // Initialize the global shared reference to the service
     // manager and get some shared resource objects.
     if (!gRDFService) {
-        rv = CallGetService(NS_RDFSERVICE_CID, &gRDFService);
+        NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
+        rv = CallGetService(kRDFServiceCID, &gRDFService);
         if (NS_FAILED(rv))
             return rv;
     }
 
     if (!gRDFContainerUtils) {
         NS_DEFINE_CID(kRDFContainerUtilsCID, NS_RDFCONTAINERUTILS_CID);
         rv = CallGetService(kRDFContainerUtilsCID, &gRDFContainerUtils);
         if (NS_FAILED(rv))
--- a/content/xul/templates/src/nsXULTemplateResultStorage.cpp
+++ b/content/xul/templates/src/nsXULTemplateResultStorage.cpp
@@ -4,21 +4,23 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsIServiceManager.h"
 #include "nsRDFCID.h"
 #include "nsIRDFService.h"
 #include "nsString.h"
 #include "nsXULTemplateResultStorage.h"
 
+static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
+
 NS_IMPL_ISUPPORTS1(nsXULTemplateResultStorage, nsIXULTemplateResult)
 
 nsXULTemplateResultStorage::nsXULTemplateResultStorage(nsXULTemplateResultSetStorage* aResultSet)
 {
-    nsCOMPtr<nsIRDFService> rdfService = do_GetService(NS_RDFSERVICE_CID);
+    nsCOMPtr<nsIRDFService> rdfService = do_GetService(kRDFServiceCID);
     rdfService->GetAnonymousResource(getter_AddRefs(mNode));
     mResultSet = aResultSet;
     if (aResultSet) {
         mResultSet->FillColumnValues(mValues);
     }
 }
 
 NS_IMETHODIMP