Title: [259631] trunk/Source/WebCore
- Revision
- 259631
- Author
- [email protected]
- Date
- 2020-04-07 02:47:36 -0700 (Tue, 07 Apr 2020)
Log Message
[GTK] gtk_icon_info_free is deprecated since GTK+ 3.8
https://bugs.webkit.org/show_bug.cgi?id=118381
Reviewed by Carlos Garcia Campos.
GtkIconInfo is a GObject since 3.8, update accordingly.
* platform/graphics/gtk/ImageGtk.cpp:
(WebCore::loadMissingImageIconFromTheme):
* platform/gtk/GUniquePtrGtk.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (259630 => 259631)
--- trunk/Source/WebCore/ChangeLog 2020-04-07 08:25:59 UTC (rev 259630)
+++ trunk/Source/WebCore/ChangeLog 2020-04-07 09:47:36 UTC (rev 259631)
@@ -1,3 +1,16 @@
+2020-04-07 Claudio Saavedra <[email protected]>
+
+ [GTK] gtk_icon_info_free is deprecated since GTK+ 3.8
+ https://bugs.webkit.org/show_bug.cgi?id=118381
+
+ Reviewed by Carlos Garcia Campos.
+
+ GtkIconInfo is a GObject since 3.8, update accordingly.
+
+ * platform/graphics/gtk/ImageGtk.cpp:
+ (WebCore::loadMissingImageIconFromTheme):
+ * platform/gtk/GUniquePtrGtk.h:
+
2020-04-07 Doug Kelly <[email protected]>
Add release asserts to KeyframeEffectStack::ensureEffectsAreSorted()
Modified: trunk/Source/WebCore/platform/graphics/gtk/ImageGtk.cpp (259630 => 259631)
--- trunk/Source/WebCore/platform/graphics/gtk/ImageGtk.cpp 2020-04-07 08:25:59 UTC (rev 259630)
+++ trunk/Source/WebCore/platform/graphics/gtk/ImageGtk.cpp 2020-04-07 09:47:36 UTC (rev 259631)
@@ -64,7 +64,7 @@
{
int iconSize = g_str_has_suffix(name, "@2x") ? 32 : 16;
auto icon = BitmapImage::create();
- GUniquePtr<GtkIconInfo> iconInfo(gtk_icon_theme_lookup_icon(gtk_icon_theme_get_default(), "image-missing", iconSize, GTK_ICON_LOOKUP_NO_SVG));
+ GRefPtr<GtkIconInfo> iconInfo = adoptGRef(gtk_icon_theme_lookup_icon(gtk_icon_theme_get_default(), "image-missing", iconSize, GTK_ICON_LOOKUP_NO_SVG));
if (iconInfo) {
auto buffer = loadResourceSharedBuffer(gtk_icon_info_get_filename(iconInfo.get()));
icon->setData(WTFMove(buffer), true);
Modified: trunk/Source/WebCore/platform/gtk/GUniquePtrGtk.h (259630 => 259631)
--- trunk/Source/WebCore/platform/gtk/GUniquePtrGtk.h 2020-04-07 08:25:59 UTC (rev 259630)
+++ trunk/Source/WebCore/platform/gtk/GUniquePtrGtk.h 2020-04-07 09:47:36 UTC (rev 259631)
@@ -26,7 +26,6 @@
namespace WTF {
WTF_DEFINE_GPTR_DELETER(GdkEvent, gdk_event_free)
-WTF_DEFINE_GPTR_DELETER(GtkIconInfo, gtk_icon_info_free)
WTF_DEFINE_GPTR_DELETER(GtkTreePath, gtk_tree_path_free)
} // namespace WTF
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
