Bug 756260 - Fix up building without JS_HAS_XML_SUPPORT, again. r=terrence.

--HG--
extra : rebase_source : 9b0bc4f31db387e4e98821d712309792c07eac1c

js/public/MemoryMetrics.h

@@ -123,7 +123,9 @@ struct CompartmentStats
     size_t gcHeapShapesBase;
     size_t gcHeapScripts;
     size_t gcHeapTypeObjects;
+#if JS_HAS_XML_SUPPORT
     size_t gcHeapXML;
+#endif
 
     size_t objectSlots;
     size_t objectElements;

js/src/MemoryMetrics.cpp

@@ -169,11 +169,13 @@ StatsCellCallback(JSRuntime *rt, void *data, void *thing, JSGCTraceKind traceKin
         obj->sizeOfExcludingThis(&cStats->typeInferenceSizes, rtStats->mallocSizeOf);
         break;
     }
+#if JS_HAS_XML_SUPPORT
     case JSTRACE_XML:
     {
         cStats->gcHeapXML += thingSize;
         break;
     }
+#endif
     }
     // Yes, this is a subtraction:  see StatsArenaCallback() for details.
     cStats->gcHeapArenaUnused -= thingSize;
@@ -223,8 +225,10 @@ CollectRuntimeStats(JSRuntime *rt, RuntimeStats *rtStats)
                       cStats.gcHeapShapesDict +
                       cStats.gcHeapShapesBase +
                       cStats.gcHeapScripts +
-                      cStats.gcHeapTypeObjects +
-                      cStats.gcHeapXML;
+#if JS_HAS_XML_SUPPORT
+                      cStats.gcHeapXML +
+#endif
+                      cStats.gcHeapTypeObjects;
 
         rtStats->gcHeapChunkDirtyUnused -= used;
         rtStats->gcHeapArenaUnused += cStats.gcHeapArenaUnused;

js/xpconnect/src/XPCJSRuntime.cpp

@@ -1423,10 +1423,12 @@ ReportCompartmentStats(const JS::CompartmentStats &cStats,
                      "Memory on the compartment's garbage-collected JavaScript "
                      "heap that holds type inference information.");
 
+#if JS_HAS_XML_SUPPORT
     REPORT_GC_BYTES0(MakePath(pathPrefix, cStats, "gc-heap/xml"),
                      cStats.gcHeapXML,
                      "Memory on the compartment's garbage-collected JavaScript "
                      "heap that holds E4X XML objects.");
+#endif
 
     REPORT_BYTES0(MakePath(pathPrefix, cStats, "objects/slots"),
                   nsIMemoryReporter::KIND_HEAP, cStats.objectSlots,