Changeset 52309 in webkit

Timestamp:

Dec 18, 2009 6:01:19 AM (14 years ago)

Author:

Philippe Normand

Message:

2009-12-18 Philippe Normand <​pnormand@igalia.com>

Reviewed by Xan Lopez.

[GTK] segfault during controls initialization if not GTK theme is present.
​https://bugs.webkit.org/show_bug.cgi?id=32705

Create empty images for the controls if no GTK theme is set.

• platform/graphics/gtk/ImageGtk.cpp: (WebCore::getThemeIconFileName): (WebCore::loadImageFromFile):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gtk/ImageGtk.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-18  Philippe Normand  <pnormand@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] segfault during controls initialization if not GTK theme is present.
+        https://bugs.webkit.org/show_bug.cgi?id=32705
+
+        Create empty images for the controls if no GTK theme is set.
+
+        * platform/graphics/gtk/ImageGtk.cpp:
+        (WebCore::getThemeIconFileName):
+        (WebCore::loadImageFromFile):
+
 2009-12-18  Alejandro G. Castro  <alex@igalia.com>
 

trunk/WebCore/platform/graphics/gtk/ImageGtk.cpp

@@ -49 +49 @@
     GtkIconInfo* iconInfo = gtk_icon_theme_lookup_icon(gtk_icon_theme_get_default(),
                                                        name, size, GTK_ICON_LOOKUP_NO_SVG);
+    // Try to fallback on MISSING_IMAGE.
     if (!iconInfo)
         iconInfo = gtk_icon_theme_lookup_icon(gtk_icon_theme_get_default(),
                                               GTK_STOCK_MISSING_IMAGE, size,
                                               GTK_ICON_LOOKUP_NO_SVG);
+    if (iconInfo) {
+        GOwnPtr<GtkIconInfo> info(iconInfo);
+        return CString(gtk_icon_info_get_filename(info.get()));
+    }
 
-    GOwnPtr<GtkIconInfo> info(iconInfo);
-    return CString(gtk_icon_info_get_filename(info.get()));
+    // No icon was found, this can happen if not GTK theme is set. In
+    // that case an empty Image will be created.
+    return CString();
 }
 
@@ -79 +85 @@
 {
     RefPtr<BitmapImage> img = BitmapImage::create();
-    RefPtr<SharedBuffer> buffer = loadResourceSharedBuffer(fileName);
-    img->setData(buffer.release(), true);
+    if (!fileName.isNull()) {
+        RefPtr<SharedBuffer> buffer = loadResourceSharedBuffer(fileName);
+        img->setData(buffer.release(), true);
+    }
     return img.release();
 }