Bug 805915 (part 1) - Rename the "cross-compartment-wrappers" memory report. r=luke.

--HG--
extra : rebase_source : a9689bde17b043bc8bec55c0307c0bbf94768232

js/public/MemoryMetrics.h

@@ -154,7 +154,7 @@ struct CompartmentStats
       , jaegerData(0)
       , ionData(0)
       , compartmentObject(0)
-      , crossCompartmentWrappers(0)
+      , crossCompartmentWrappersTable(0)
       , regexpCompartment(0)
       , debuggeesSet(0)
     {}
@@ -189,7 +189,7 @@ struct CompartmentStats
       , jaegerData(other.jaegerData)
       , ionData(other.ionData)
       , compartmentObject(other.compartmentObject)
-      , crossCompartmentWrappers(other.crossCompartmentWrappers)
+      , crossCompartmentWrappersTable(other.crossCompartmentWrappersTable)
       , regexpCompartment(other.regexpCompartment)
       , debuggeesSet(other.debuggeesSet)
       , typeInferenceSizes(other.typeInferenceSizes)
@@ -232,7 +232,7 @@ struct CompartmentStats
     size_t jaegerData;
     size_t ionData;
     size_t compartmentObject;
-    size_t crossCompartmentWrappers;
+    size_t crossCompartmentWrappersTable;
     size_t regexpCompartment;
     size_t debuggeesSet;
 
@@ -273,7 +273,7 @@ struct CompartmentStats
         ADD(jaegerData);
         ADD(ionData);
         ADD(compartmentObject);
-        ADD(crossCompartmentWrappers);
+        ADD(crossCompartmentWrappersTable);
         ADD(regexpCompartment);
         ADD(debuggeesSet);
 

js/src/jsmemorymetrics.cpp

@@ -95,7 +95,7 @@ StatsCompartmentCallback(JSRuntime *rt, void *data, JSCompartment *compartment)
                                      &cStats.compartmentObject,
                                      &cStats.typeInferenceSizes,
                                      &cStats.shapesCompartmentTables,
-                                     &cStats.crossCompartmentWrappers,
+                                     &cStats.crossCompartmentWrappersTable,
                                      &cStats.regexpCompartment,
                                      &cStats.debuggeesSet);
 }

js/xpconnect/src/XPCJSRuntime.cpp

@@ -1596,9 +1596,9 @@ ReportCompartmentStats(const JS::CompartmentStats &cStats,
                   cStats.compartmentObject,
                   "Memory used for the JSCompartment object itself.");
 
-    CREPORT_BYTES(cJSPathPrefix + NS_LITERAL_CSTRING("cross-compartment-wrappers"),
-                  cStats.crossCompartmentWrappers,
-                  "Memory used by cross-compartment wrappers.");
+    CREPORT_BYTES(cJSPathPrefix + NS_LITERAL_CSTRING("cross-compartment-wrapper-table"),
+                  cStats.crossCompartmentWrappersTable,
+                  "Memory used by the cross-compartment wrapper table.");
 
     CREPORT_BYTES(cJSPathPrefix + NS_LITERAL_CSTRING("regexp-compartment"),
                   cStats.regexpCompartment,