Bug 720219 (part 5) - Clean up JS type object measurement. r=bhackett.

--HG--
extra : rebase_source : 4d972fd2dd17181bf6facd077e71b05c6cc72307

js/public/MemoryMetrics.h

@@ -195,17 +195,17 @@ GetExplicitNonHeapForRuntime(JSRuntime *rt, int64_t *amount,
 
 #endif /* JS_THREADSAFE */
 
-extern JS_PUBLIC_API(void)
+extern void
 SizeOfCompartmentTypeInferenceData(JSContext *cx, JSCompartment *compartment,
                                    TypeInferenceMemoryStats *stats,
                                    JSMallocSizeOfFun mallocSizeOf);
 
-extern JS_PUBLIC_API(void)
-SizeOfObjectTypeInferenceData(/*TypeObject*/ void *object,
+extern void
+SizeOfTypeObjectExcludingThis(/*TypeObject*/ void *object,
                               TypeInferenceMemoryStats *stats,
                               JSMallocSizeOfFun mallocSizeOf);
 
-extern JS_PUBLIC_API(size_t)
+extern size_t
 SizeOfCompartmentShapeTable(JSCompartment *c, JSMallocSizeOfFun mallocSizeOf);
 
 extern JS_PUBLIC_API(size_t)

js/src/MemoryMetrics.cpp

@@ -178,7 +178,7 @@ CellCallback(JSContext *cx, void *vdata, void *thing, JSGCTraceKind traceKind,
     {
         types::TypeObject *obj = static_cast<types::TypeObject *>(thing);
         curr->gcHeapTypeObjects += thingSize;
-        SizeOfObjectTypeInferenceData(obj, &curr->typeInferenceMemory,
+        SizeOfTypeObjectExcludingThis(obj, &curr->typeInferenceMemory,
                                       data->mallocSizeOf);
         break;
     }

js/src/jscompartment.cpp

@@ -744,7 +744,7 @@ JSCompartment::createBarrierTracer()
     return NULL;
 }
 
-JS_PUBLIC_API(size_t)
+size_t
 JS::SizeOfCompartmentShapeTable(JSCompartment *c, JSMallocSizeOfFun mallocSizeOf)
 {
     return c->baseShapes.sizeOfExcludingThis(mallocSizeOf)

js/src/jsinfer.cpp

@@ -6331,7 +6331,7 @@ GetScriptMemoryStats(JSScript *script, TypeInferenceMemoryStats *stats, JSMalloc
     }
 }
 
-JS_PUBLIC_API(void)
+void
 JS::SizeOfCompartmentTypeInferenceData(JSContext *cx, JSCompartment *compartment,
                                        TypeInferenceMemoryStats *stats,
                                        JSMallocSizeOfFun mallocSizeOf)
@@ -6377,8 +6377,8 @@ JS::SizeOfCompartmentTypeInferenceData(JSContext *cx, JSCompartment *compartment
     }
 }
 
-JS_PUBLIC_API(void)
-JS::SizeOfObjectTypeInferenceData(void *object_, TypeInferenceMemoryStats *stats, JSMallocSizeOfFun mallocSizeOf)
+void
+JS::SizeOfTypeObjectExcludingThis(void *object_, TypeInferenceMemoryStats *stats, JSMallocSizeOfFun mallocSizeOf)
 {
     TypeObject *object = (TypeObject *) object_;