Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 919889 (part 4) - Assorted minor clean-ups. r=luke.

Browse Source
This commit is contained in:
Nicholas Nethercote 2013-09-24 23:24:28 -07:00
parent 57e83b0455
commit ddc0d5782b
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
js/public/MemoryMetrics.h
View File

@ -7,8 +7,8 @@
#ifndef js_MemoryMetrics_h
#define js_MemoryMetrics_h
// These declarations are not within jsapi.h because they are highly likely to
// change in the future. Depend on them at your own risk.
// These declarations are highly likely to change in the future. Depend on them
// at your own risk.
#include "mozilla/MemoryReporting.h"
#include "mozilla/NullPtr.h"
@ -23,7 +23,7 @@
#include "js/Utility.h"
#include "js/Vector.h"
class nsISupports; // This is needed for ObjectPrivateVisitor.
class nsISupports; // Needed for ObjectPrivateVisitor.
namespace js {
@ -48,9 +48,7 @@ struct InefficientNonFlatteningStringHashPolicy
struct ZoneStatsPod
{
ZoneStatsPod() {
mozilla::PodZero(this);
}
ZoneStatsPod() { mozilla::PodZero(this); }
void add(const ZoneStatsPod &other) {
#define ADD(x) this->x += other.x
@ -109,7 +107,7 @@ struct ObjectsExtraSizes
size_t propertyIteratorData;
size_t ctypesData;
ObjectsExtraSizes() { memset(this, 0, sizeof(ObjectsExtraSizes)); }
ObjectsExtraSizes() { mozilla::PodZero(this); }
void add(ObjectsExtraSizes &sizes) {
this->slots += sizes.slots;
@ -135,7 +133,7 @@ struct TypeInferenceSizes
size_t arrayTypeTables;
size_t objectTypeTables;
TypeInferenceSizes() { memset(this, 0, sizeof(TypeInferenceSizes)); }
TypeInferenceSizes() { mozilla::PodZero(this); }
void add(TypeInferenceSizes &sizes) {
this->typeScripts += sizes.typeScripts;
@ -156,7 +154,7 @@ struct CodeSizes
size_t other;
size_t unused;
CodeSizes() { memset(this, 0, sizeof(CodeSizes)); }
CodeSizes() { mozilla::PodZero(this); }
};
@ -248,7 +246,7 @@ struct NotableStringInfo : public StringInfo
// compartments within it.
struct RuntimeSizes
{
RuntimeSizes() { memset(this, 0, sizeof(RuntimeSizes)); }
RuntimeSizes() { mozilla::PodZero(this); }
size_t object;
size_t atomsTable;

10
js/xpconnect/src/XPCJSRuntime.cpp
View File

@ -1731,7 +1731,7 @@ private:
rtTotal += amount; \
} while (0)
NS_MEMORY_REPORTER_MALLOC_SIZEOF_FUN(JsMallocSizeOf)
NS_MEMORY_REPORTER_MALLOC_SIZEOF_FUN(JSMallocSizeOf)
namespace xpc {
@ -2441,7 +2441,7 @@ class XPCJSRuntimeStats : public JS::RuntimeStats
public:
XPCJSRuntimeStats(WindowPaths *windowPaths, WindowPaths *topWindowPaths,
bool getLocations)
: JS::RuntimeStats(JsMallocSizeOf),
: JS::RuntimeStats(JSMallocSizeOf),
mWindowPaths(windowPaths),
mTopWindowPaths(topWindowPaths),
mGetLocations(getLocations)
@ -2574,8 +2574,8 @@ JSReporter::CollectReports(WindowPaths *windowPaths,
return NS_ERROR_FAILURE;
size_t xpconnect =
xpcrt->SizeOfIncludingThis(JsMallocSizeOf) +
XPCWrappedNativeScope::SizeOfAllScopesIncludingThis(JsMallocSizeOf);
xpcrt->SizeOfIncludingThis(JSMallocSizeOf) +
XPCWrappedNativeScope::SizeOfAllScopesIncludingThis(JSMallocSizeOf);
// This is the second step (see above). First we report stuff in the
// "explicit" tree, then we report other stuff.
@ -3047,7 +3047,7 @@ XPCJSRuntime::newXPCJSRuntime(nsXPConnect* aXPConnect)
XPCJSRuntime* self = new XPCJSRuntime(aXPConnect);
if (self &&
self->Runtime() &&
self->Runtime() &&
self->GetWrappedJSMap() &&
self->GetWrappedJSClassMap() &&
self->GetIID2NativeInterfaceMap() &&