Title: [155341] releases/WebKitGTK/webkit-2.2/Source/WebCore
- Revision
- 155341
- Author
- carlo...@webkit.org
- Date
- 2013-09-09 03:01:50 -0700 (Mon, 09 Sep 2013)
Log Message
Merge r155329 - [GTK] ghost cursor when mouse hovers over an image file in a tab
https://bugs.webkit.org/show_bug.cgi?id=120675
Reviewed by Carlos Garcia Campos.
No new tests, covered by existing.
* platform/gtk/CursorGtk.cpp:
(WebCore::createNamedCursor): Use new gdk_cursor_new_from_surface()
when compiling against GTK+ 3.9.12 or newer.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.2/Source/WebCore/ChangeLog (155340 => 155341)
--- releases/WebKitGTK/webkit-2.2/Source/WebCore/ChangeLog 2013-09-09 09:56:16 UTC (rev 155340)
+++ releases/WebKitGTK/webkit-2.2/Source/WebCore/ChangeLog 2013-09-09 10:01:50 UTC (rev 155341)
@@ -1,3 +1,16 @@
+2013-09-09 Claudio Saavedra <csaave...@igalia.com>
+
+ [GTK] ghost cursor when mouse hovers over an image file in a tab
+ https://bugs.webkit.org/show_bug.cgi?id=120675
+
+ Reviewed by Carlos Garcia Campos.
+
+ No new tests, covered by existing.
+
+ * platform/gtk/CursorGtk.cpp:
+ (WebCore::createNamedCursor): Use new gdk_cursor_new_from_surface()
+ when compiling against GTK+ 3.9.12 or newer.
+
2013-09-04 Zan Dobersek <zdober...@igalia.com>
[GTK] Add support for the Wayland build target
Modified: releases/WebKitGTK/webkit-2.2/Source/WebCore/platform/gtk/CursorGtk.cpp (155340 => 155341)
--- releases/WebKitGTK/webkit-2.2/Source/WebCore/platform/gtk/CursorGtk.cpp 2013-09-09 09:56:16 UTC (rev 155340)
+++ releases/WebKitGTK/webkit-2.2/Source/WebCore/platform/gtk/CursorGtk.cpp 2013-09-09 10:01:50 UTC (rev 155341)
@@ -54,8 +54,12 @@
cairo_set_source_surface(cr.get(), source.get(), 0, 0);
cairo_mask_surface(cr.get(), mask.get(), 0, 0);
+#if GTK_CHECK_VERSION(3, 9, 12)
+ return adoptGRef(gdk_cursor_new_from_surface(gdk_display_get_default(), surface.get(), cursor.hot_x, cursor.hot_y));
+#else
GRefPtr<GdkPixbuf> pixbuf = adoptGRef(gdk_pixbuf_get_from_surface(surface.get(), 0, 0, 32, 32));
return adoptGRef(gdk_cursor_new_from_pixbuf(gdk_display_get_default(), pixbuf.get(), cursor.hot_x, cursor.hot_y));
+#endif
}
static GRefPtr<GdkCursor> createCustomCursor(Image* image, const IntPoint& hotSpot)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
