corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1157628: Reformat spidermonkey source directory, again; r=jandem

Browse Source
This commit is contained in:
Benjamin Bouvier
2015-04-23 12:22:36 +02:00
parent 512c7433be
commit e91b9fe658
26 changed files with 113 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
js/src/jsobj.cpp
View File

@@ -4041,17 +4041,17 @@ JSObject::sizeOfIncludingThisInNursery() const
MOZ_ASSERT(!isTenured());
const Nursery &nursery = compartment()->runtimeFromAnyThread()->gc.nursery;
const Nursery& nursery = compartment()->runtimeFromAnyThread()->gc.nursery;
size_t size = Arena::thingSize(allocKindForTenure(nursery));
if (is<NativeObject>()) {
const NativeObject &native = as<NativeObject>();
const NativeObject& native = as<NativeObject>();
size += native.numFixedSlots() * sizeof(Value);
size += native.numDynamicSlots() * sizeof(Value);
if (native.hasDynamicElements()) {
js::ObjectElements &elements = *native.getElementsHeader();
js::ObjectElements& elements = *native.getElementsHeader();
if (!elements.isCopyOnWrite() || elements.ownerObject() == this)
size += elements.capacity * sizeof(HeapSlot);
}
@@ -4063,7 +4063,7 @@ JSObject::sizeOfIncludingThisInNursery() const
size_t
JS::ubi::Concrete<JSObject>::size(mozilla::MallocSizeOf mallocSizeOf) const
{
JSObject &obj = get();
JSObject& obj = get();
if (!obj.isTenured())
return obj.sizeOfIncludingThisInNursery();