This commit is contained in:
Mounir Lamouri 2011-06-29 14:29:29 +02:00
Родитель c1843526e1
Коммит c740f703db
2 изменённых файлов: 13 добавлений и 5 удалений

Просмотреть файл

@ -71,7 +71,7 @@ nsDOMMemoryReporter::GetPath(char** aMemoryPath)
NS_IMETHODIMP
nsDOMMemoryReporter::GetKind(int* aKind)
{
*aKind = MR_HEAP;
*aKind = KIND_HEAP;
return NS_OK;
}
@ -82,6 +82,13 @@ nsDOMMemoryReporter::GetDescription(char** aDescription)
return NS_OK;
}
NS_IMETHODIMP
nsDOMMemoryReporter::GetUnits(PRInt32* aUnits)
{
*aUnits = UNITS_BYTES;
return NS_OK;
}
static
PLDHashOperator
GetWindowsMemoryUsage(const PRUint64& aId, nsGlobalWindow*& aWindow,
@ -92,11 +99,11 @@ GetWindowsMemoryUsage(const PRUint64& aId, nsGlobalWindow*& aWindow,
}
NS_IMETHODIMP
nsDOMMemoryReporter::GetMemoryUsed(PRInt64* aMemoryUsed) {
*aMemoryUsed = 0;
nsDOMMemoryReporter::GetAmount(PRInt64* aAmount) {
*aAmount = 0;
nsGlobalWindow::WindowByIdTable* windows = nsGlobalWindow::GetWindowsTable();
windows->Enumerate(GetWindowsMemoryUsage, aMemoryUsed);
windows->Enumerate(GetWindowsMemoryUsage, aAmount);
return NS_OK;
}

Просмотреть файл

@ -51,7 +51,8 @@ public:
NS_IMETHOD GetPath(char** aMemoryPath);
NS_IMETHOD GetKind(int* aKnd);
NS_IMETHOD GetDescription(char** aDescription);
NS_IMETHOD GetMemoryUsed(PRInt64* aMemoryUsed);
NS_IMETHOD GetUnits(PRInt32* aUnits);
NS_IMETHOD GetAmount(PRInt64* aAmount);
private:
// Protect ctor, use Init() instead.