Issue #80 - De-unify dom/xul

dom/xul/moz.build

@@ -19,7 +19,7 @@ if CONFIG['MOZ_XUL']:
         'nsIXULDocument.h',
     ]
 
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'nsXULCommandDispatcher.cpp',
         'nsXULContentSink.cpp',
         'nsXULElement.cpp',
@@ -36,7 +36,7 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'xul'
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'nsXULControllers.cpp',
 ]
 

dom/xul/nsXULContentSink.cpp

@@ -42,6 +42,7 @@
 #include "nsReadableUtils.h"
 #include "nsXULElement.h"
 #include "mozilla/Logging.h"
+#include "mozilla/CheckedInt.h"
 #include "prmem.h"
 #include "nsCRT.h"
 
@@ -57,6 +58,7 @@
 #include "nsIScriptError.h"
 #include "nsContentTypeParser.h"
 
+using namespace mozilla;
 static mozilla::LazyLogModule gContentSinkLog("nsXULContentSink");;
 
 //----------------------------------------------------------------------

dom/xul/templates/moz.build

@@ -17,7 +17,7 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'xultmpl'
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'nsContentSupportMap.cpp',
     'nsContentTestNode.cpp',
     'nsInstantiationNode.cpp',

dom/xul/templates/nsInstantiationNode.cpp

@@ -8,6 +8,9 @@
 #include "nsXULTemplateQueryProcessorRDF.h"
 
 #include "mozilla/Logging.h"
+
+using namespace mozilla;
+
 extern mozilla::LazyLogModule gXULTemplateLog;
 
 nsInstantiationNode::nsInstantiationNode(nsXULTemplateQueryProcessorRDF* aProcessor,

dom/xul/templates/nsTemplateMap.h

@@ -9,6 +9,8 @@
 #include "PLDHashTable.h"
 #include "nsXULElement.h"
 
+using mozilla::fallible;
+
 class nsTemplateMap {
 protected:
     struct Entry : public PLDHashEntryHdr {

dom/xul/templates/nsXULTemplateQueryProcessorRDF.cpp

@@ -35,6 +35,10 @@
 #include "nsXULSortService.h"
 #include "nsIDocument.h"
 
+#include "mozilla/Logging.h"
+
+using namespace mozilla;
+
 //----------------------------------------------------------------------
 
 #define PARSE_TYPE_INTEGER  "Integer"

dom/xul/templates/nsXULTemplateQueryProcessorStorage.cpp

@@ -28,6 +28,8 @@
 #include "nsIDocument.h"
 #include "nsNetUtil.h"
 
+using mozilla::fallible;
+
 //----------------------------------------------------------------------
 //
 // nsXULTemplateResultSetStorage

dom/xul/templates/nsXULTreeBuilder.cpp

@@ -32,6 +32,9 @@
 #include "nsTreeContentView.h"
 #include "nsIXULStore.h"
 #include "mozilla/BinarySearch.h"
+#include "mozilla/Logging.h"
+
+using mozilla::LogLevel;
 
 // For security check
 #include "nsIDocument.h"