зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1160592 - Report image source size again in about:memory. r=dholbert
This commit is contained in:
Родитель
c83c60a47f
Коммит
8c1a4b3bb1
|
@ -208,6 +208,8 @@ private:
|
||||||
const char* aPathPrefix,
|
const char* aPathPrefix,
|
||||||
const ImageMemoryCounter& aCounter)
|
const ImageMemoryCounter& aCounter)
|
||||||
{
|
{
|
||||||
|
nsresult rv;
|
||||||
|
|
||||||
nsAutoCString pathPrefix(NS_LITERAL_CSTRING("explicit/"));
|
nsAutoCString pathPrefix(NS_LITERAL_CSTRING("explicit/"));
|
||||||
pathPrefix.Append(aPathPrefix);
|
pathPrefix.Append(aPathPrefix);
|
||||||
pathPrefix.Append(aCounter.Type() == imgIContainer::TYPE_RASTER
|
pathPrefix.Append(aCounter.Type() == imgIContainer::TYPE_RASTER
|
||||||
|
@ -228,7 +230,13 @@ private:
|
||||||
|
|
||||||
pathPrefix.Append(")/");
|
pathPrefix.Append(")/");
|
||||||
|
|
||||||
return ReportSurfaces(aHandleReport, aData, pathPrefix, aCounter);
|
rv = ReportSurfaces(aHandleReport, aData, pathPrefix, aCounter);
|
||||||
|
NS_ENSURE_SUCCESS(rv, rv);
|
||||||
|
|
||||||
|
rv = ReportSourceValue(aHandleReport, aData, pathPrefix, aCounter.Values());
|
||||||
|
NS_ENSURE_SUCCESS(rv, rv);
|
||||||
|
|
||||||
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
static nsresult ReportSurfaces(nsIHandleReportCallback* aHandleReport,
|
static nsresult ReportSurfaces(nsIHandleReportCallback* aHandleReport,
|
||||||
|
@ -332,10 +340,7 @@ private:
|
||||||
{
|
{
|
||||||
nsresult rv;
|
nsresult rv;
|
||||||
|
|
||||||
rv = ReportValue(aHandleReport, aData, KIND_HEAP, aPathPrefix,
|
rv = ReportSourceValue(aHandleReport, aData, aPathPrefix, aCounter);
|
||||||
"source",
|
|
||||||
"Raster image source data and vector image documents.",
|
|
||||||
aCounter.Source());
|
|
||||||
NS_ENSURE_SUCCESS(rv, rv);
|
NS_ENSURE_SUCCESS(rv, rv);
|
||||||
|
|
||||||
rv = ReportValue(aHandleReport, aData, KIND_HEAP, aPathPrefix,
|
rv = ReportValue(aHandleReport, aData, KIND_HEAP, aPathPrefix,
|
||||||
|
@ -353,6 +358,21 @@ private:
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static nsresult ReportSourceValue(nsIHandleReportCallback* aHandleReport,
|
||||||
|
nsISupports* aData,
|
||||||
|
const nsACString& aPathPrefix,
|
||||||
|
const MemoryCounter& aCounter)
|
||||||
|
{
|
||||||
|
nsresult rv;
|
||||||
|
|
||||||
|
rv = ReportValue(aHandleReport, aData, KIND_HEAP, aPathPrefix,
|
||||||
|
"source",
|
||||||
|
"Raster image source data and vector image documents.",
|
||||||
|
aCounter.Source());
|
||||||
|
|
||||||
|
return rv;
|
||||||
|
}
|
||||||
|
|
||||||
static nsresult ReportValue(nsIHandleReportCallback* aHandleReport,
|
static nsresult ReportValue(nsIHandleReportCallback* aHandleReport,
|
||||||
nsISupports* aData,
|
nsISupports* aData,
|
||||||
int32_t aKind,
|
int32_t aKind,
|
||||||
|
|
Загрузка…
Ссылка в новой задаче