Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-02 06:22:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 993747 - nsAppRunner.cpp should use NS_FREE_PERMANENT_DATA rather than making up its own variant of the same concept. r=karlt

Browse Source
This commit is contained in:
L. David Baron 2014-04-09 21:47:57 -07:00
parent 6b72d8a8ba
commit 3bd0b3b614
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
toolkit/xre/nsAppRunner.cpp
View File

@ -213,9 +213,7 @@ static char **gQtOnlyArgv;
#endif
#if defined(MOZ_WIDGET_GTK)
#if defined(DEBUG) || defined(NS_BUILD_REFCNT_LOGGING) \
|| defined(NS_TRACE_MALLOC)
#define CLEANUP_MEMORY 1
#if defined(NS_FREE_PERMANENT_DATA)
#define PANGO_ENABLE_BACKEND
#include <pango/pangofc-fontmap.h>
#endif
@ -2596,7 +2594,7 @@ static PRFuncPtr FindFunction(const char* aName)
static void MOZ_gdk_display_close(GdkDisplay *display)
{
#if CLEANUP_MEMORY
#ifdef NS_FREE_PERMANENT_DATA
// XXX wallpaper for bug 417163: don't close the Display if we're using the
// Qt theme because we crash (in Qt code) when using jemalloc.
bool theme_is_qt = false;
@ -2663,7 +2661,7 @@ static void MOZ_gdk_display_close(GdkDisplay *display)
if (!theme_is_qt)
gdk_display_close(display);
}
#else // not CLEANUP_MEMORY
#else // not NS_FREE_PERMANENT_DATA
// Don't do anything to avoid running into driver bugs under XCloseDisplay().
// See bug 973192.
(void) display;