Backed out changeset 376965bcb1f7 (bug 1197059) for Valgrind leaks.
authorRyan VanderMeulen <ryanvm@gmail.com>
Thu, 27 Aug 2015 19:20:32 -0400
changeset 259668 6684a6657c75bf4d4114d7b54fe1781be3a345a3
parent 259667 be25e1af79f4e8a88c7bfbf7550791e2e761d056
child 259669 d78b83a8b57cd31fa1c564197c19af23e186191f
push id64314
push userryanvm@gmail.com
push dateThu, 27 Aug 2015 23:20:36 +0000
treeherdermozilla-inbound@6684a6657c75 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1197059
milestone43.0a1
backs out376965bcb1f7410398a187fcb9735e676bcb90d7
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 376965bcb1f7 (bug 1197059) for Valgrind leaks.
widget/gtk/nsAppShell.cpp
--- a/widget/gtk/nsAppShell.cpp
+++ b/widget/gtk/nsAppShell.cpp
@@ -102,28 +102,16 @@ nsAppShell::Init()
     if (!sPollFunc) {
         sPollFunc = g_main_context_get_poll_func(nullptr);
         g_main_context_set_poll_func(nullptr, &PollWrapper);
     }
 
     if (PR_GetEnv("MOZ_DEBUG_PAINTS"))
         gdk_window_set_debug_updates(TRUE);
 
-    // Disable JasPer module in GDK-PixBuf. See bug 1197059.
-    GSList* pixbufFormats = gdk_pixbuf_get_formats();
-    for (GSList* iter = pixbufFormats; iter; iter = iter->next) {
-        GdkPixbufFormat* format = static_cast<GdkPixbufFormat*>(iter->data);
-        gchar* name = gdk_pixbuf_format_get_name(format);
-        if (strcmp(name, "jpeg2000") == 0) {
-            gdk_pixbuf_format_set_disabled(format, TRUE);
-            break;
-        }
-    }
-    g_slist_free(pixbufFormats);
-
     int err = pipe(mPipeFDs);
     if (err)
         return NS_ERROR_OUT_OF_MEMORY;
 
     GIOChannel *ioc;
     GSource *source;
 
     // make the pipe nonblocking