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

Bug 947798 (part 2) - Remove MemoryMultiReporter, because it's no longer helpful. r=mccr8.

Browse Source
This commit is contained in:
Nicholas Nethercote
2013-12-07 21:39:47 -08:00
parent 0e122b9e83
commit fb860b68d3
27 changed files with 105 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
netwerk/cache/nsCacheService.cpp vendored
View File

@@ -1071,8 +1071,8 @@ private:
*****************************************************************************/
nsCacheService * nsCacheService::gService = nullptr;
NS_IMPL_ISUPPORTS_INHERITED2(nsCacheService, MemoryMultiReporter,
nsICacheService, nsICacheServiceInternal)
NS_IMPL_ISUPPORTS3(nsCacheService, nsICacheService, nsICacheServiceInternal,
nsIMemoryReporter)
nsCacheService::nsCacheService()
: mObserver(nullptr),
@@ -3184,6 +3184,8 @@ nsCacheService::LeavePrivateBrowsing()
}
}
MOZ_DEFINE_MALLOC_SIZE_OF(DiskCacheDeviceMallocSizeOf)
NS_IMETHODIMP
nsCacheService::CollectReports(nsIHandleReportCallback* aHandleReport,
nsISupports* aData)
@@ -3192,7 +3194,7 @@ nsCacheService::CollectReports(nsIHandleReportCallback* aHandleReport,
if (mDiskDevice) {
nsCacheServiceAutoLock
lock(LOCK_TELEM(NSCACHESERVICE_DISKDEVICEHEAPSIZE));
disk = mDiskDevice->SizeOfIncludingThis(MallocSizeOf);
disk = mDiskDevice->SizeOfIncludingThis(DiskCacheDeviceMallocSizeOf);
}
size_t memory = mMemoryDevice ? mMemoryDevice->TotalSize() : 0;