mozilla-inbound: changeset 263392:a29828c4d7be167a1334d9de4309057e462edb56

author	Lee Salzman <lsalzman@mozilla.com>
	Thu, 17 Sep 2015 15:01:51 -0400
changeset 263392	a29828c4d7be167a1334d9de4309057e462edb56
parent 263391	ffd40920af0c9020488448939e550637c563b5ed
child 263393	f33142322571d4a84728aa03f6378ff1211c597e
push id	65295
push user	archaeopteryx@coole-files.de
push date	Sat, 19 Sep 2015 09:20:06 +0000
treeherder	mozilla-inbound@11c096c410a7 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	acomminos, dveditz
bugs	1205741
milestone	43.0a1
first release with	nightly linux32 ccd6b5f5e544 / 43.0a1 / 20150920030217 / files nightly linux64 ccd6b5f5e544 / 43.0a1 / 20150920030217 / files nightly mac ccd6b5f5e544 / 43.0a1 / 20150920030217 / files nightly win32 ccd6b5f5e544 / 43.0a1 / 20150920030217 / files nightly win64 ccd6b5f5e544 / 43.0a1 / 20150920030217 / files
last release without	nightly linux32 4313752f6995 / 43.0a1 / 20150919030207 / files nightly linux64 4313752f6995 / 43.0a1 / 20150919030207 / files nightly mac 4313752f6995 / 43.0a1 / 20150919030207 / files nightly win32 4313752f6995 / 43.0a1 / 20150919030207 / files nightly win64 4313752f6995 / 43.0a1 / 20150919030207 / files

--- a/widget/gtk/nsAppShell.cpp
+++ b/widget/gtk/nsAppShell.cpp
@@ -111,17 +111,19 @@ nsAppShell::Init()
     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, "jpeg") &&
             strcmp(name, "png") &&
             strcmp(name, "gif") &&
             strcmp(name, "bmp") &&
-            strcmp(name, "ico")) {
+            strcmp(name, "ico") &&
+            strcmp(name, "xpm") &&
+            strcmp(name, "svg")) {
           gdk_pixbuf_format_set_disabled(format, TRUE);
         }
         g_free(name);
     }
     g_slist_free(pixbufFormats);
 
     int err = pipe(mPipeFDs);
     if (err)