1160592 - Bug 1157954 causes 8MiB regression in heap-unclassified in AWSY

Status: RESOLVED FIXED

(Core :: Graphics: ImageLib, defect)

Description

[Eric Rahm [:erahm]]

+++ This bug was initially created as a clone of Bug #1157954 +++

It looks like about 8MiB of image data is no longer reported and gets lumped into heap-unclassified.

Comment 1

[Eric Rahm [:erahm]]

Attachment: memory before regression

Comment 2

[Eric Rahm [:erahm]]

Attachment: memory after regression

Comment 3

[Seth Fowler [:seth] [:s2h]]

Looks an awful lot like we're just not reporting source data anymore. It must've gotten busted in bug 1157954.

Comment 4

[Seth Fowler [:seth] [:s2h]]

Attachment: Report image source size again in about:memory

Sure enough, we mistakenly stopped reporting image source size in bug 1157954.
This patch makes us report it again.

Comment 5

[Daniel Holbert [:dholbert]]

Comment on attachment 8600549 [details] [diff] [review]
Report image source size again in about:memory

>diff --git a/image/src/imgLoader.cpp b/image/src/imgLoader.cpp
>-    return ReportSurfaces(aHandleReport, aData, pathPrefix, aCounter);
>+    nsresult rv = ReportSurfaces(aHandleReport, aData, pathPrefix, aCounter);
>+    NS_ENSURE_SUCCESS(rv, rv);
[...]
>   static nsresult ReportValues(nsIHandleReportCallback* aHandleReport,
>                                nsISupports* aData,
>                                const nsACString& aPathPrefix,
>                                const MemoryCounter& aCounter)
>   {
>     nsresult rv;
> 
>+    rv = ReportSourceValue(aHandleReport, aData, aPathPrefix, aCounter);
>     NS_ENSURE_SUCCESS(rv, rv);

Extreme nit: this is inconsistent in "nsresult rv" declaration style (whether it's declared ahead of time vs. declared inline with assignment).

Consider making this consistent, one way or the other.

r=me regardless

Comment 6

[Seth Fowler [:seth] [:s2h]]

Attachment: Report image source size again in about:memory

Thanks for the review! I made the |rv| declaration style consistent in this version of the patch.

Comment 7

[Seth Fowler [:seth] [:s2h]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/1fa448752bd9

Comment 8

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/1fa448752bd9