Backed out changeset 58dbd2146e24 (bug 944961) for bustage.

dothq · Dec 3, 2013 · 2fb3a52 · 2fb3a52
1 parent e51a2e7
commit 2fb3a52
Show file tree

Hide file tree

Showing 11 changed files with 55 additions and 57 deletions.
diff --git a/rdf/base/src/moz.build b/rdf/base/src/moz.build
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'nsCompositeDataSource.cpp',
     'nsContainerEnumerator.cpp',
     'nsDefaultResourceFactory.cpp',

diff --git a/rdf/base/src/nsCompositeDataSource.cpp b/rdf/base/src/nsCompositeDataSource.cpp
@@ -49,6 +49,8 @@
 PRLogModuleInfo* nsRDFLog = nullptr;
 #endif
 
+static NS_DEFINE_IID(kISupportsIID,           NS_ISUPPORTS_IID);
+
 //----------------------------------------------------------------------
 //
 // CompositeDataSourceImpl

diff --git a/rdf/base/src/nsContainerEnumerator.cpp b/rdf/base/src/nsContainerEnumerator.cpp
@@ -36,6 +36,11 @@
 
 ////////////////////////////////////////////////////////////////////////
 
+static NS_DEFINE_CID(kRDFServiceCID,        NS_RDFSERVICE_CID);
+static NS_DEFINE_CID(kRDFContainerUtilsCID, NS_RDFCONTAINERUTILS_CID);
+
+////////////////////////////////////////////////////////////////////////
+
 class ContainerEnumeratorImpl : public nsISimpleEnumerator {
 private:
     // pseudo-constants
@@ -79,8 +84,6 @@ ContainerEnumeratorImpl::Init()
 {
     if (gRefCnt++ == 0) {
         nsresult rv;
-
-        NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
         nsCOMPtr<nsIRDFService> rdf = do_GetService(kRDFServiceCID);
         NS_ASSERTION(rdf != nullptr, "unable to acquire resource manager");
         if (! rdf)
@@ -90,7 +93,6 @@ ContainerEnumeratorImpl::Init()
         NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get resource");
         if (NS_FAILED(rv)) return rv;
 
-        NS_DEFINE_CID(kRDFContainerUtilsCID, NS_RDFCONTAINERUTILS_CID);
         rv = CallGetService(kRDFContainerUtilsCID, &gRDFC);
         if (NS_FAILED(rv)) return rv;
     }

diff --git a/rdf/base/src/nsInMemoryDataSource.cpp b/rdf/base/src/nsInMemoryDataSource.cpp
@@ -69,6 +69,11 @@
 #include "rdfIDataSource.h"
 #include "rdfITripleVisitor.h"
 
+#ifdef PR_LOGGING
+static PRLogModuleInfo* gLog = nullptr;
+#endif
+
+
 // This struct is used as the slot value in the forward and reverse
 // arcs hash tables.
 //
@@ -360,17 +365,8 @@ class InMemoryDataSource : public nsIRDFDataSource,
 #endif
 
     bool    mPropagateChanges;
-
-private:
-#ifdef PR_LOGGING
-    static PRLogModuleInfo* gLog;
-#endif
 };
 
-#ifdef PR_LOGGING
-PRLogModuleInfo* InMemoryDataSource::gLog;
-#endif
-
 //----------------------------------------------------------------------
 //
 // InMemoryAssertionEnumeratorImpl

diff --git a/rdf/base/src/nsRDFContainer.cpp b/rdf/base/src/nsRDFContainer.cpp
@@ -45,6 +45,10 @@
 #include "nsXPIDLString.h"
 #include "rdf.h"
 
+static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
+static NS_DEFINE_CID(kRDFContainerUtilsCID, NS_RDFCONTAINERUTILS_CID);
+static const char kRDFNameSpaceURI[] = RDF_NAMESPACE_URI;
+
 #define RDF_SEQ_LIST_LIMIT   8
 
 class RDFContainerImpl : public nsIRDFContainer
@@ -377,7 +381,6 @@ RDFContainerImpl::Init()
     if (gRefCnt++ == 0) {
         nsresult rv;
 
-        NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
         rv = CallGetService(kRDFServiceCID, &gRDFService);
         if (NS_FAILED(rv)) {
             NS_ERROR("unable to get RDF service");
@@ -388,7 +391,6 @@ RDFContainerImpl::Init()
                                       &kRDF_nextVal);
         if (NS_FAILED(rv)) return rv;
 
-        NS_DEFINE_CID(kRDFContainerUtilsCID, NS_RDFCONTAINERUTILS_CID);
         rv = CallGetService(kRDFContainerUtilsCID, &gRDFContainerUtils);
         if (NS_FAILED(rv)) {
             NS_ERROR("unable to get RDF container utils service");
@@ -686,7 +688,6 @@ RDFContainerImpl::GetNextValue(nsIRDFResource** aResult)
         }
     }
 
-    static const char kRDFNameSpaceURI[] = RDF_NAMESPACE_URI;
     char buf[sizeof(kRDFNameSpaceURI) + 16];
     nsFixedCString nextValStr(buf, sizeof(buf), 0);
     nextValStr = kRDFNameSpaceURI;

diff --git a/rdf/base/src/nsRDFContainerUtils.cpp b/rdf/base/src/nsRDFContainerUtils.cpp
@@ -23,6 +23,9 @@
 #include "rdf.h"
 #include "rdfutil.h"
 
+static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
+static const char kRDFNameSpaceURI[] = RDF_NAMESPACE_URI;
+
 class RDFContainerUtilsImpl : public nsIRDFContainerUtils
 {
 public:
@@ -54,9 +57,9 @@ class RDFContainerUtilsImpl : public nsIRDFContainerUtils
     static nsIRDFResource* kRDF_Seq;
     static nsIRDFResource* kRDF_Alt;
     static nsIRDFLiteral* kOne;
-    static const char kRDFNameSpaceURI[];
 };
 
+
 int32_t         RDFContainerUtilsImpl::gRefCnt = 0;
 nsIRDFService*  RDFContainerUtilsImpl::gRDFService;
 nsIRDFResource* RDFContainerUtilsImpl::kRDF_instanceOf;
@@ -65,7 +68,6 @@ nsIRDFResource* RDFContainerUtilsImpl::kRDF_Bag;
 nsIRDFResource* RDFContainerUtilsImpl::kRDF_Seq;
 nsIRDFResource* RDFContainerUtilsImpl::kRDF_Alt;
 nsIRDFLiteral*  RDFContainerUtilsImpl::kOne;
-const char      RDFContainerUtilsImpl::kRDFNameSpaceURI[] = RDF_NAMESPACE_URI;
 
 ////////////////////////////////////////////////////////////////////////
 // nsISupports interface
@@ -323,7 +325,6 @@ RDFContainerUtilsImpl::RDFContainerUtilsImpl()
     if (gRefCnt++ == 0) {
         nsresult rv;
 
-        NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
         rv = CallGetService(kRDFServiceCID, &gRDFService);
 
         NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get RDF service");

diff --git a/rdf/base/src/nsRDFContentSink.cpp b/rdf/base/src/nsRDFContentSink.cpp
@@ -68,6 +68,25 @@
 
 using namespace mozilla;
 
+////////////////////////////////////////////////////////////////////////
+// XPCOM IIDs
+
+static NS_DEFINE_IID(kIContentSinkIID,         NS_ICONTENT_SINK_IID); // XXX grr...
+static NS_DEFINE_IID(kIExpatSinkIID,           NS_IEXPATSINK_IID);
+static NS_DEFINE_IID(kIRDFServiceIID,          NS_IRDFSERVICE_IID);
+static NS_DEFINE_IID(kISupportsIID,            NS_ISUPPORTS_IID);
+static NS_DEFINE_IID(kIXMLContentSinkIID,      NS_IXMLCONTENT_SINK_IID);
+static NS_DEFINE_IID(kIRDFContentSinkIID,      NS_IRDFCONTENTSINK_IID);
+
+static NS_DEFINE_CID(kRDFServiceCID,            NS_RDFSERVICE_CID);
+static NS_DEFINE_CID(kRDFContainerUtilsCID,     NS_RDFCONTAINERUTILS_CID);
+
+////////////////////////////////////////////////////////////////////////
+
+#ifdef PR_LOGGING
+static PRLogModuleInfo* gLog;
+#endif
+
 ///////////////////////////////////////////////////////////////////////
 
 enum RDFContentSinkState {
@@ -225,11 +244,6 @@ class RDFContentSinkImpl : public nsIRDFContentSink,
     nsAutoTArray<RDFContextStackElement, 8>* mContextStack;
 
     nsIURI*      mDocumentURL;
-
-private:
-#ifdef PR_LOGGING
-    static PRLogModuleInfo* gLog;
-#endif
 };
 
 int32_t         RDFContentSinkImpl::gRefCnt = 0;
@@ -242,10 +256,6 @@ nsIRDFResource* RDFContentSinkImpl::kRDF_Bag;
 nsIRDFResource* RDFContentSinkImpl::kRDF_Seq;
 nsIRDFResource* RDFContentSinkImpl::kRDF_nextVal;
 
-#ifdef PR_LOGGING
-PRLogModuleInfo* RDFContentSinkImpl::gLog;
-#endif
-
 ////////////////////////////////////////////////////////////////////////
 
 #define RDF_ATOM(name_, value_) nsIAtom* RDFContentSinkImpl::name_;
@@ -272,7 +282,6 @@ RDFContentSinkImpl::RDFContentSinkImpl()
       mDocumentURL(nullptr)
 {
     if (gRefCnt++ == 0) {
-        NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
         nsresult rv = CallGetService(kRDFServiceCID, &gRDFService);
 
         NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get RDF service");
@@ -291,7 +300,7 @@ RDFContentSinkImpl::RDFContentSinkImpl()
                                           &kRDF_nextVal);
         }
 
-        NS_DEFINE_CID(kRDFContainerUtilsCID, NS_RDFCONTAINERUTILS_CID);
+
         rv = CallGetService(kRDFContainerUtilsCID, &gRDFContainerUtils);
 
         NS_RegisterStaticAtoms(rdf_atoms);
@@ -372,12 +381,6 @@ RDFContentSinkImpl::QueryInterface(REFNSIID iid, void** result)
     if (! result)
         return NS_ERROR_NULL_POINTER;
 
-    NS_DEFINE_IID(kIContentSinkIID,    NS_ICONTENT_SINK_IID);
-    NS_DEFINE_IID(kIExpatSinkIID,      NS_IEXPATSINK_IID);
-    NS_DEFINE_IID(kISupportsIID,       NS_ISUPPORTS_IID);
-    NS_DEFINE_IID(kIXMLContentSinkIID, NS_IXMLCONTENT_SINK_IID);
-    NS_DEFINE_IID(kIRDFContentSinkIID, NS_IRDFCONTENTSINK_IID);
-
     *result = nullptr;
     if (iid.Equals(kIRDFContentSinkIID) ||
         iid.Equals(kIXMLContentSinkIID) ||

diff --git a/rdf/base/src/nsRDFService.cpp b/rdf/base/src/nsRDFService.cpp
@@ -70,6 +70,10 @@ static NS_DEFINE_IID(kIRDFIntIID,         NS_IRDFINT_IID);
 static NS_DEFINE_IID(kIRDFNodeIID,            NS_IRDFNODE_IID);
 static NS_DEFINE_IID(kISupportsIID,           NS_ISUPPORTS_IID);
 
+#ifdef PR_LOGGING
+static PRLogModuleInfo* gLog = nullptr;
+#endif
+
 class BlobImpl;
 
 // These functions are copied from nsprpub/lib/ds/plhash.c, with one
@@ -724,10 +728,6 @@ IntImpl::EqualsInt(nsIRDFInt* intValue, bool* result)
 ////////////////////////////////////////////////////////////////////////
 // RDFServiceImpl
 
-#ifdef PR_LOGGING
-PRLogModuleInfo* RDFServiceImpl::gLog;
-#endif
-
 RDFServiceImpl*
 RDFServiceImpl::gRDFService;
 

diff --git a/rdf/base/src/nsRDFService.h b/rdf/base/src/nsRDFService.h
@@ -28,7 +28,6 @@
 #include "nsString.h"
 
 struct PLHashTable;
-struct PRLogModuleInfo;
 class nsIRDFLiteral;
 class nsIRDFInt;
 class nsIRDFDate;
@@ -37,10 +36,6 @@ class BlobImpl;
 class RDFServiceImpl : public nsIRDFService,
                        public nsSupportsWeakReference
 {
-#ifdef PR_LOGGING
-    static PRLogModuleInfo* gLog;
-#endif
-
 protected:
     PLHashTable* mNamedDataSources;
     PLDHashTable mResources;

diff --git a/rdf/base/src/nsRDFXMLDataSource.cpp b/rdf/base/src/nsRDFXMLDataSource.cpp
@@ -97,6 +97,15 @@
 
 #include "rdfIDataSource.h"
 
+//----------------------------------------------------------------------
+
+static NS_DEFINE_CID(kRDFInMemoryDataSourceCID, NS_RDFINMEMORYDATASOURCE_CID);
+static NS_DEFINE_CID(kRDFServiceCID,            NS_RDFSERVICE_CID);
+
+#ifdef PR_LOGGING
+static PRLogModuleInfo* gLog;
+#endif
+
 //----------------------------------------------------------------------
 //
 // RDFXMLDataSourceImpl
@@ -132,10 +141,6 @@ class RDFXMLDataSourceImpl : public nsIRDFDataSource,
     static int32_t gRefCnt;
     static nsIRDFService* gRDFService;
 
-#ifdef PR_LOGGING
-    static PRLogModuleInfo* gLog;
-#endif
-
     nsresult Init();
     RDFXMLDataSourceImpl(void);
     virtual ~RDFXMLDataSourceImpl(void);
@@ -358,10 +363,6 @@ class RDFXMLDataSourceImpl : public nsIRDFDataSource,
 int32_t         RDFXMLDataSourceImpl::gRefCnt = 0;
 nsIRDFService*  RDFXMLDataSourceImpl::gRDFService;
 
-#ifdef PR_LOGGING
-PRLogModuleInfo* RDFXMLDataSourceImpl::gLog;
-#endif
-
 static const char kFileURIPrefix[] = "file:";
 static const char kResourceURIPrefix[] = "resource:";
 
@@ -409,12 +410,10 @@ nsresult
 RDFXMLDataSourceImpl::Init()
 {
     nsresult rv;
-    NS_DEFINE_CID(kRDFInMemoryDataSourceCID, NS_RDFINMEMORYDATASOURCE_CID);
     mInner = do_CreateInstance(kRDFInMemoryDataSourceCID, &rv);
     if (NS_FAILED(rv)) return rv;
 
     if (gRefCnt++ == 0) {
-        NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
         rv = CallGetService(kRDFServiceCID, &gRDFService);
 
         NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get RDF service");
@@ -743,7 +742,6 @@ RDFXMLDataSourceImpl::rdfXMLFlush(nsIURI *aURI)
         // we are, we're screwed: it's too late to serialize because
         // many of the services that we'll need to acquire to properly
         // write the file will be unaquirable.
-        NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
         nsCOMPtr<nsIRDFService> dummy = do_GetService(kRDFServiceCID, &rv);
         if (NS_FAILED(rv)) {
             NS_WARNING("unable to Flush() dirty datasource during XPCOM shutdown");

diff --git a/rdf/datasource/src/moz.build b/rdf/datasource/src/moz.build
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'nsFileSystemDataSource.cpp',
     'nsLocalStore.cpp',
 ]