Closed Bug 995880 Opened 10 years ago Closed 10 years ago

VolatileBuffer non-heap memory use by images is not reported

Categories

(Core :: Graphics: ImageLib, defect)

30 Branch
defect
Not set
normal

Tracking

()

RESOLVED FIXED
mozilla31
blocking-b2g 1.3T+
Tracking Status
firefox29 --- unaffected
firefox30 --- fixed
firefox31 --- fixed
b2g-v1.3T --- fixed
b2g-v1.4 --- fixed
b2g-v2.0 --- fixed

People

(Reporter: tnikkel, Assigned: tnikkel)

References

Details

(Whiteboard: [MemShrink])

Attachments

(1 file)

      No description provided.
Attached patch patchSplinter Review
Also, I noticed the else was removed in the same patch, was that intentional? I restored it in this patch.
Attachment #8405984 - Flags: review?(mwu)
OS: Mac OS X → All
Hardware: x86 → All
Version: 29 Branch → 30 Branch
Whiteboard: [MemShrink]
Comment on attachment 8405984 [details] [diff] [review]
patch

Review of attachment 8405984 [details] [diff] [review]:
-----------------------------------------------------------------

::: image/src/imgFrame.cpp
@@ +927,5 @@
>  #endif
>  #ifdef XP_MACOSX
>    if (mQuartzSurface && aLocation == gfxMemoryLocation::IN_PROCESS_HEAP) {
>      n += aMallocSizeOf(mQuartzSurface);
> +  } else

This was in fact intentional. mQuartzSurface always wraps a mImageSurface and never really owns its data. We have to add the mImageSurface to count everything.

@@ +947,5 @@
>    }
>  
> +  if (mVBuf && aLocation == gfxMemoryLocation::IN_PROCESS_NONHEAP) {
> +    n += mVBuf->NonHeapSizeOfExcludingThis();
> +  }

Thanks - I really can't remember why I didn't just do this in the first place..
Attachment #8405984 - Flags: review?(mwu) → review+
(In reply to Michael Wu [:mwu] from comment #2)
> ::: image/src/imgFrame.cpp
> @@ +927,5 @@
> >  #endif
> >  #ifdef XP_MACOSX
> >    if (mQuartzSurface && aLocation == gfxMemoryLocation::IN_PROCESS_HEAP) {
> >      n += aMallocSizeOf(mQuartzSurface);
> > +  } else
> 
> This was in fact intentional. mQuartzSurface always wraps a mImageSurface
> and never really owns its data. We have to add the mImageSurface to count
> everything.

Okay, removed that bit.
We should get this everywhere bug 962670 is, which I think is 30 and 1.3T, otherwise doing any sort of work with image memory there will be severely hampered.
Comment on attachment 8405984 [details] [diff] [review]
patch

[Approval Request Comment]
Bug caused by (feature/regressing bug #): bug 962670
User impact if declined: memory used by images will be dark matter in about:memory, ie we won't know what is using the memory used by images
Testing completed (on m-c, etc.): just landed m-c
Risk to taking this patch (and alternatives if risky): low
String or IDL/UUID changes made by this patch: none
Attachment #8405984 - Flags: approval-mozilla-aurora?
I don't know how to deal with just 1.3T (and not 1.3).
https://hg.mozilla.org/mozilla-central/rev/f9cda4dc752e
Status: NEW → RESOLVED
Closed: 10 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla31
Attachment #8405984 - Flags: approval-mozilla-aurora? → approval-mozilla-aurora+
https://hg.mozilla.org/releases/mozilla-aurora/rev/8fdfcb379dda

(In reply to Timothy Nikkel (:tn) from comment #7)
> I don't know how to deal with just 1.3T (and not 1.3).

Request 1.3T blocking status (done :)..) and then land away once it has it.
blocking-b2g: 1.3T? → 1.3T+
Fabrice, do we need land it on v1.3t?
Flags: needinfo?(fabrice)
and backed out from 1.3t because I messed up the uplift:
 https://hg.mozilla.org/releases/mozilla-b2g28_v1_3t/rev/0b141ffd3b27
Flags: needinfo?(fabrice)
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Created:
Updated:
Size: