Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 798914 (part 3) - Use newly introduced MozMallocSizeOf in xpt. r=njn.

Browse Source 
--HG--
extra : rebase_source : 6c3d707727bd1448acb26317cab2c64c82aa896c
This commit is contained in:
Catalin Iacob 2013-06-20 21:17:44 +02:00
parent 09cfbe927e
commit 0fc2c54e7b
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xpcom/typelib/xpt/public/xpt_arena.h
View File

@ -12,6 +12,7 @@
#include "prtypes.h"
#include <stdlib.h>
#include "mozilla/MemoryReporting.h"
#include "mozilla/StandardInteger.h"
@ -53,11 +54,8 @@ XPT_NotifyDoneLoading(XPTArena *arena);
XPT_PUBLIC_API(void)
XPT_ArenaFree(XPTArena *arena, void* block);
/* A synonym of |nsMallocSizeOfFun|, because we don't #include nscore.h. */
typedef size_t(*xptMallocSizeOfFun)(const void *p);
XPT_PUBLIC_API(size_t)
XPT_SizeOfArena(XPTArena *arena, xptMallocSizeOfFun mallocSizeOf);
XPT_SizeOfArena(XPTArena *arena, MozMallocSizeOf mallocSizeOf);
/* --------------------------------------------------------- */

3
xpcom/typelib/xpt/src/xpt_arena.c
View File

@ -12,6 +12,7 @@
*/
#include "xpt_arena.h"
#include "mozilla/MemoryReporting.h"
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
@ -306,7 +307,7 @@ XPT_AssertFailed(const char *s, const char *file, uint32_t lineno)
#endif
XPT_PUBLIC_API(size_t)
XPT_SizeOfArena(XPTArena *arena, xptMallocSizeOfFun mallocSizeOf)
XPT_SizeOfArena(XPTArena *arena, MozMallocSizeOf mallocSizeOf)
{
size_t n = mallocSizeOf(arena);