Title: [195292] releases/WebKitGTK/webkit-2.10/Source/WebCore
- Revision
- 195292
- Author
- [email protected]
- Date
- 2016-01-19 09:20:59 -0800 (Tue, 19 Jan 2016)
Log Message
Merge r195291 - Unreviewed. Fix GTK+ build with GTK+ < 3.14.
Flags GTK_ICON_LOOKUP_DIR_LTR and GTK_ICON_LOOKUP_DIR_RTL were
added in GTK+ 3.14.
* rendering/RenderThemeGtk.cpp:
(WebCore::loadThemedIcon):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (195291 => 195292)
--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2016-01-19 17:06:35 UTC (rev 195291)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2016-01-19 17:20:59 UTC (rev 195292)
@@ -1,3 +1,13 @@
+2016-01-19 Carlos Garcia Campos <[email protected]>
+
+ Unreviewed. Fix GTK+ build with GTK+ < 3.14.
+
+ Flags GTK_ICON_LOOKUP_DIR_LTR and GTK_ICON_LOOKUP_DIR_RTL were
+ added in GTK+ 3.14.
+
+ * rendering/RenderThemeGtk.cpp:
+ (WebCore::loadThemedIcon):
+
2015-09-18 Chris Dumez <[email protected]>
WebContent crash in WebCore::MemoryPressureHandler::releaseCriticalMemory() with GuardMalloc when preparing to suspend
Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderThemeGtk.cpp (195291 => 195292)
--- releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderThemeGtk.cpp 2016-01-19 17:06:35 UTC (rev 195291)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderThemeGtk.cpp 2016-01-19 17:20:59 UTC (rev 195292)
@@ -376,10 +376,12 @@
GRefPtr<GIcon> icon = adoptGRef(g_themed_icon_new(iconName));
unsigned lookupFlags = GTK_ICON_LOOKUP_USE_BUILTIN | GTK_ICON_LOOKUP_FORCE_SIZE | GTK_ICON_LOOKUP_FORCE_SVG;
GtkTextDirection direction = gtk_style_context_get_direction(context);
+#if GTK_CHECK_VERSION(3, 14, 0)
if (direction & GTK_TEXT_DIR_LTR)
lookupFlags |= GTK_ICON_LOOKUP_DIR_LTR;
else if (direction & GTK_TEXT_DIR_RTL)
lookupFlags |= GTK_ICON_LOOKUP_DIR_RTL;
+#endif
int width, height;
gtk_icon_size_lookup(iconSize, &width, &height);
GRefPtr<GtkIconInfo> iconInfo = adoptGRef(gtk_icon_theme_lookup_by_gicon(gtk_icon_theme_get_default(), icon.get(), std::min(width, height), static_cast<GtkIconLookupFlags>(lookupFlags)));
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
