Merge m-c to inbound.

This commit is contained in:
Ryan VanderMeulen 2012-09-23 21:30:24 -04:00
commit c886b63c9a
3 changed files with 121 additions and 1 deletions

View File

@ -35,3 +35,68 @@
...
obj:/builds/slave/valgrind-linux/objdir/dist/firefox/libmozsqlite3.so
}
{
Bug 793532
Memcheck:Leak
fun:malloc
fun:_ZN8JSObject25allocateSlowArrayElementsEP9JSContext
...
}
{
This is intended, see bug 793534
Memcheck:Leak
fun:malloc
fun:strdup
fun:moz_strdup
fun:_ZL9SaveToEnvPKc
...
}
{
Bug 793535
Memcheck:Leak
fun:calloc
fun:_dlerror_run
fun:dlsym
fun:PR_SetCurrentThreadName
...
}
{
Bug 793536
Memcheck:Leak
fun:malloc
fun:moz_xmalloc
fun:_ZNSt11_Deque_baseIN11MessageLoop11PendingTaskESaIS1_EE17_M_initialize_mapEj
...
}
{
Bug 793537
Memcheck:Leak
...
obj:/usr/lib/libpango-1.0.so.0.2800.1
...
}
{
Bug 793539 which may be fixed or change when bug 713802 is fixed
Memcheck:Leak
...
obj:/usr/lib/libgnomevfs-2.so.0.2400.2
...
}
{
Bug 793548
Memcheck:Leak
fun:malloc
fun:moz_xmalloc
fun:NS_Alloc_P
fun:_Z12ToNewCStringRK19nsACString_internal
fun:_ZN13CrashReporter14SetupExtraDataEP7nsIFileRK19nsACString_internal
...
}
{
Bug 793549
Memcheck:Leak
fun:realloc
fun:PR_Realloc
fun:GrowStuff
...
}

View File

@ -28,3 +28,58 @@
fun:_XSend
fun:XChangeProperty
}
{
Bug 793532
Memcheck:Leak
fun:malloc
fun:_ZN8JSObject25allocateSlowArrayElementsEP9JSContext
...
}
{
Bug 793533
Memcheck:Leak
fun:malloc
fun:moz_xmalloc
fun:_Z22xpc_CreateGlobalObjectP9JSContextP7JSClassP12nsIPrincipalP11nsISupportsbPP8JSObjectPP13JSCompartment
...
}
{
This is intended, see bug 793534
Memcheck:Leak
fun:malloc
fun:strdup
fun:moz_strdup
fun:_ZL9SaveToEnvPKc
...
}
{
Bug 793535
Memcheck:Leak
fun:calloc
fun:_dlerror_run
fun:dlsym
fun:PR_SetCurrentThreadName
...
}
{
Bug 793536
Memcheck:Leak
fun:malloc
fun:moz_xmalloc
fun:_ZNSt11_Deque_baseIN11MessageLoop11PendingTaskESaIS1_EE17_M_initialize_mapEm
...
}
{
Bug 793537
Memcheck:Leak
...
obj:/usr/lib64/libpango-1.0.so.0.2800.1
...
}
{
Bug 793539 which may be fixed or change when bug 713802 is fixed
Memcheck:Leak
...
obj:/usr/lib64/libgnomevfs-2.so.0.2400.2
...
}

View File

@ -1843,7 +1843,7 @@ nsPrintEngine::ReflowDocList(nsPrintObject* aPO, bool aSetPixelScale)
if (aPO->mParent && aPO->mParent->mPresShell) {
nsIFrame* frame = aPO->mContent ? aPO->mContent->GetPrimaryFrame() : nullptr;
if (!frame || !frame->GetStyleVisibility()->IsVisible()) {
aPO->mDontPrint = true;
SetPrintPO(aPO, false);
aPO->mInvisible = true;
return NS_OK;
}